openstack/tacker
Code Issues Proposed changes

Separating tosca driver out from VNFM

Browse Source 
This patch is expected to have the separation of tosca driver
in the future.

Implements blueprint: #tosca-engine

Change-Id: Ieab0964f9a5936611a9b2288f2d6d44a42a725de
This commit is contained in:
doantungbk 2017-03-28 10:49:23 -07:00
parent 8d6d76ff98
commit 72d7af1d6a
15 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api-ref/source/v1/samples/vnffgds/vnffgds-create-response.json
View File

@ -6,8 +6,8 @@
"template": {
"vnffgd": {
"imports": [
"/opt/stack/tacker/tacker/vnfm/tosca/lib/tacker_defs.yaml",
"/opt/stack/tacker/tacker/vnfm/tosca/lib/tacker_nfv_defs.yaml"
"/opt/stack/tacker/tacker/tosca/lib/tacker_defs.yaml",
"/opt/stack/tacker/tacker/tosca/lib/tacker_nfv_defs.yaml"
],
"description": "Sample VNFFG template",
"topology_template": {

4
api-ref/source/v1/samples/vnffgds/vnffgds-list-response.json
View File

@ -8,8 +8,8 @@
"vnffgd": {
"tosca_definitions_version": "tosca_simple_profile_for_nfv_1_0_0",
"imports": [
"/opt/stack/tacker/tacker/vnfm/tosca/lib/tacker_defs.yaml",
"/opt/stack/tacker/tacker/vnfm/tosca/lib/tacker_nfv_defs.yaml"
"/opt/stack/tacker/tacker/tosca/lib/tacker_defs.yaml",
"/opt/stack/tacker/tacker/tosca/lib/tacker_nfv_defs.yaml"
],
"description": "Sample VNFFG template",
"topology_template": {

4
api-ref/source/v1/samples/vnffgds/vnffgds-show-response.json
View File

@ -7,8 +7,8 @@
"vnffgd": {
"tosca_definitions_version": "tosca_simple_profile_for_nfv_1_0_0",
"imports": [
"/opt/stack/tacker/tacker/vnfm/tosca/lib/tacker_defs.yaml",
"/opt/stack/tacker/tacker/vnfm/tosca/lib/tacker_nfv_defs.yaml"
"/opt/stack/tacker/tacker/tosca/lib/tacker_defs.yaml",
"/opt/stack/tacker/tacker/tosca/lib/tacker_nfv_defs.yaml"
],
"description": "Sample VNFFG template",
"topology_template": {

4
doc/source/devref/vnffgd_template_description.rst
View File

@ -64,7 +64,7 @@ through a set of VNFs.
(traffic match policy to flow through the path), and path (chain of
VNFs/Connection Points). A complete list of VNFFG properties currently
supported by Tacker are listed `here <https://github
.com/openstack/tacker/blob/master/tacker/vnfm/
.com/openstack/tacker/blob/master/tacker/
tosca/lib/tacker_nfv_defs.yaml>`_ under **properties** section of
**tosca.nodes.nfv.FP.Tacker** field.
@ -106,7 +106,7 @@ Policy defines the type of match policy that will be used to distinguish
which traffic should enter this Forwarding Path. The only currently
supported type is ACL (access-list).
Please reference `tosca.nfv.datatypes.aclType
<https://github.com/openstack/tacker/blob/master/tacker/vnfm/tosca/lib/
<https://github.com/openstack/tacker/blob/master/tacker/tosca/lib/
tacker_nfv_defs.yaml>`_ under **properties** section for more information on
supported match criteria.

4
tacker/nfvo/nfvo_plugin.py
View File

@ -43,10 +43,10 @@ from tacker.extensions import common_services as cs
from tacker.extensions import nfvo
from tacker import manager
from tacker.plugins.common import constants
from tacker.vnfm.tosca import utils as toscautils
from tacker.vnfm import vim_client
from toscaparser import tosca_template
from tacker.tosca import utils as toscautils
from toscaparser import tosca_template
LOG = logging.getLogger(__name__)
CONF = cfg.CONF

2
tacker/tests/functional/vnfm/test_tosca_vnf_multiple_vdu.py
View File

@ -20,7 +20,7 @@ from tacker.plugins.common import constants as evt_constants
from tacker.tests import constants
from tacker.tests.functional import base
from tacker.tests.utils import read_file
from tacker.vnfm.tosca import utils as toscautils
from tacker.tosca import utils as toscautils
CONF = cfg.CONF

4
tacker/tests/functional/vnfm/test_tosca_vnfc.py
View File

@ -11,17 +11,19 @@
# under the License.
import os
from oslo_config import cfg
from toscaparser import tosca_template
import unittest
import yaml
from tacker.common import utils
from tacker.plugins.common import constants as evt_constants
from tacker.tests import constants
from tacker.tests.functional import base
from tacker.tests.utils import read_file
from tacker.vnfm.tosca import utils as toscautils
from tacker.tosca import utils as toscautils
CONF = cfg.CONF
SOFTWARE_DEPLOYMENT = 'OS::Heat::SoftwareDeployment'

6
tacker/tests/unit/test_tosca_templates_under_samples.py
View File

@ -13,14 +13,14 @@
# under the License.
import os
import testtools
import testtools
from toscaparser import tosca_template
from toscaparser.utils import yamlparser
from tacker.vnfm.tosca import utils
from translator.hot import tosca_translator
from tacker.tosca import utils
class TestSamples(testtools.TestCase):
"""Sample tosca validation.

5
tacker/tests/unit/vnfm/tosca/test_utils.py
View File

@ -13,10 +13,11 @@
import codecs
import os
import testtools
import yaml
from tacker.vnfm.tosca import utils as toscautils
from tacker.tosca import utils as toscautils
from toscaparser import tosca_template
from translator.hot import tosca_translator
@ -41,7 +42,7 @@ class TestToscaUtils(testtools.TestCase):
super(TestToscaUtils, self).setUp()
def test_updateimport(self):
importspath = os.path.abspath('./tacker/vnfm/tosca/lib/')
importspath = os.path.abspath('./tacker/tosca/lib/')
file1 = importspath + '/tacker_defs.yaml'
file2 = importspath + '/tacker_nfv_defs.yaml'
expected_imports = [file1, file2]

0
tacker/vnfm/tosca/__init__.py → tacker/tosca/__init__.py
View File

0
tacker/vnfm/tosca/lib/tacker_defs.yaml → tacker/tosca/lib/tacker_defs.yaml
View File

0
tacker/vnfm/tosca/lib/tacker_nfv_defs.yaml → tacker/tosca/lib/tacker_nfv_defs.yaml
View File

0
tacker/vnfm/tosca/utils.py → tacker/tosca/utils.py
View File

4
tacker/vnfm/infra_drivers/openstack/translate_template.py
View File

@ -9,6 +9,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import copy
from oslo_config import cfg
@ -23,11 +24,10 @@ import yaml
from tacker.common import log
from tacker.extensions import common_services as cs
from tacker.extensions import vnfm
from tacker.vnfm.tosca import utils as toscautils
from tacker.tosca import utils as toscautils
from collections import OrderedDict
LOG = logging.getLogger(__name__)
CONF = cfg.CONF

3
tacker/vnfm/plugin.py
View File

@ -34,9 +34,10 @@ from tacker.extensions import vnfm
from tacker.plugins.common import constants
from tacker.vnfm.mgmt_drivers import constants as mgmt_constants
from tacker.vnfm import monitor
from tacker.vnfm.tosca import utils as toscautils
from tacker.vnfm import vim_client
from tacker.tosca import utils as toscautils
LOG = logging.getLogger(__name__)
CONF = cfg.CONF