Device refactor part4: rename vm plugin and db into vnfm plugin and db

Change-Id: Iee231428b7f30c4710b264e73ba71b5d5a4f84bb
Partial-bug: #1589018
This commit is contained in:
gong yong sheng
2016-08-31 09:57:22 +08:00
parent 3f4e899f79
commit cc1e82aa84
10 changed files with 20 additions and 20 deletions

View File

@@ -24,7 +24,7 @@ Based on this comparison database can be healed with healing migration.
from tacker.db import model_base
from tacker.db.nfvo import nfvo_db # noqa
from tacker.db.nfvo import vnffg_db # noqa
from tacker.db.vm import vm_db # noqa
from tacker.db.vnfm import vnfm_db # noqa
def get_metadata():

View File

@@ -28,7 +28,7 @@ from tacker.db import db_base
from tacker.db import model_base
from tacker.db import models_v1
from tacker.db import types
from tacker.db.vm import vm_db
from tacker.db.vnfm import vnfm_db
from tacker.extensions import nfvo
from tacker import manager
from tacker.plugins.common import constants
@@ -167,7 +167,7 @@ class NfvoPluginDb(nfvo.NFVOPluginBase, db_base.CommonDbMixin):
def is_vim_still_in_use(self, context, vim_id):
with context.session.begin(subtransactions=True):
vnfs_db = self._model_query(context, vm_db.VNF).filter_by(
vnfs_db = self._model_query(context, vnfm_db.VNF).filter_by(
vim_id=vim_id).first()
if vnfs_db is not None:
raise nfvo.VimInUseException(vim_id=vim_id)