aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfujinhua <fu.jinhua@zte.com.cn>2019-04-28 09:45:53 +0800
committerfujinhua <fu.jinhua@zte.com.cn>2019-04-28 09:45:53 +0800
commite7e681901dadadfcc299f85dae393b16c32e655d (patch)
tree929ab06007b7adb8151abc81c07d96ce7a97777a
parente3d6c832b166394e55dd10162dd60fd3a3e179cb (diff)
Refactor codes for catalog ns pkg ut
Change-Id: I5555ec026d56ceaf68b79a6061ab8ee085d4f752 Issue-ID: VFC-1306 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
-rw-r--r--catalog/packages/tests/test_nspackage.py224
1 files changed, 2 insertions, 222 deletions
diff --git a/catalog/packages/tests/test_nspackage.py b/catalog/packages/tests/test_nspackage.py
index a308a2eb..91f35036 100644
--- a/catalog/packages/tests/test_nspackage.py
+++ b/catalog/packages/tests/test_nspackage.py
@@ -21,6 +21,7 @@ from django.test import Client
from catalog.pub.utils import restcall, toscaparser
from catalog.pub.database.models import NSPackageModel, VnfPackageModel, PnfPackageModel
from catalog.pub.msapi import sdc
+from .const import nsd_data
class TestNsPackage(TestCase):
@@ -28,228 +29,7 @@ class TestNsPackage(TestCase):
self.client = Client()
NSPackageModel.objects.filter().delete()
VnfPackageModel.objects.filter().delete()
- self.nsd_data = {"vnffgs": [{"vnffg_id": "vnffg1",
- "description": "",
- "members": ["path1",
- "path2"],
- "properties": {"vendor": "zte",
- "connection_point": ["m6000_data_in",
- "m600_tunnel_cp",
- "m6000_data_out"],
- "version": "1.0",
- "constituent_vnfs": ["VFW",
- "VNAT"],
- "number_of_endpoints": 3,
- "dependent_virtual_link": ["sfc_data_network",
- "ext_datanet_net",
- "ext_mnet_net"]}}],
- "inputs": {"sfc_data_network": {"type": "string",
- "value": "sfc_data_network"},
- "externalDataNetworkName": {"type": "string",
- "value": "vlan_4004_tunnel_net"},
- "externalManageNetworkName": {"type": "string",
- "value": "vlan_4008_mng_net"},
- "NatIpRange": {"type": "string",
- "value": "192.167.0.10-192.168.0.20"},
- "externalPluginManageNetworkName": {"type": "string",
- "value": "vlan_4007_plugin_net"}},
- "pnfs": [{"pnf_id": "m6000_s",
- "cps": [],
- "description": "",
- "properties": {"vendor": "zte",
- "request_reclassification": False,
- "pnf_type": "m6000s",
- "version": "1.0",
- "management_address": "111111",
- "id": "m6000_s",
- "nsh_aware": False}}],
- "fps": [{"properties": {"symmetric": False,
- "policy": {"type": "ACL",
- "criteria": {"dest_port_range": "1-100",
- "ip_protocol": "tcp",
- "source_ip_range": ["119.1.1.1-119.1.1.10"],
- "dest_ip_range": [{"get_input": "NatIpRange"}],
- "dscp": 0,
- "source_port_range": "1-100"}}},
- "forwarder_list": [{"capability": "",
- "type": "cp",
- "node_name": "m6000_data_out"},
- {"capability": "",
- "type": "cp",
- "node_name": "m600_tunnel_cp"},
- {"capability": "vnat_fw_inout",
- "type": "vnf",
- "node_name": "VNAT"}],
- "description": "",
- "fp_id": "path2"},
- {"properties": {"symmetric": True,
- "policy": {"type": "ACL",
- "criteria": {"dest_port_range": "1-100",
- "ip_protocol": "tcp",
- "source_ip_range": ["1-100"],
- "dest_ip_range": ["1-100"],
- "dscp": 4,
- "source_port_range": "1-100"}}},
- "forwarder_list": [{"capability": "",
- "type": "cp",
- "node_name": "m6000_data_in"},
- {"capability": "",
- "type": "cp",
- "node_name": "m600_tunnel_cp"},
- {"capability": "vfw_fw_inout",
- "type": "vnf",
- "node_name": "VFW"},
- {"capability": "vnat_fw_inout",
- "type": "vnf",
- "node_name": "VNAT"},
- {"capability": "",
- "type": "cp",
- "node_name": "m600_tunnel_cp"},
- {"capability": "",
- "type": "cp",
- "node_name": "m6000_data_out"}],
- "description": "",
- "fp_id": "path1"}],
- "routers": [],
- "vnfs": [{"vnf_id": "VFW",
- "description": "",
- "properties": {"plugin_info": "vbrasplugin_1.0",
- "vendor": "zte",
- "is_shared": False,
- "adjust_vnf_capacity": True,
- "name": "VFW",
- "vnf_extend_type": "driver",
- "csarVersion": "v1.0",
- "csarType": "NFAR",
- "csarProvider": "ZTE",
- "version": "1.0",
- "nsh_aware": True,
- "cross_dc": False,
- "vnf_type": "VFW",
- "vmnumber_overquota_alarm": True,
- "vnfd_version": "1.0.0",
- "externalPluginManageNetworkName": "vlan_4007_plugin_net",
- "id": "vcpe_vfw_zte_1_0",
- "request_reclassification": False},
- "dependencies": [{"key_name": "vfw_ctrl_by_manager_cp",
- "vl_id": "ext_mnet_net"},
- {"key_name": "vfw_data_cp",
- "vl_id": "sfc_data_network"}],
- "type": "tosca.nodes.nfv.ext.zte.VNF.VFW",
- "networks": []}],
- "ns_exposed": {"external_cps": [],
- "forward_cps": []},
- "policies": [{"file_url": "policies/abc.drl",
- "name": "aaa"}],
- "vls": [{"route_id": "",
- "vl_id": "ext_mnet_net",
- "route_external": False,
- "description": "",
- "properties": {"name": "vlan_4008_mng_net",
- "mtu": 1500,
- "location_info": {"tenant": "admin",
- "vimid": 2,
- "availability_zone": "nova"},
- "ip_version": 4,
- "dhcp_enabled": True,
- "network_name": "vlan_4008_mng_net",
- "network_type": "vlan"}},
- {"route_id": "",
- "vl_id": "ext_datanet_net",
- "route_external": False,
- "description": "",
- "properties": {"name": "vlan_4004_tunnel_net",
- "mtu": 1500,
- "location_info": {"tenant": "admin",
- "vimid": 2,
- "availability_zone": "nova"},
- "ip_version": 4,
- "dhcp_enabled": True,
- "network_name": "vlan_4004_tunnel_net",
- "network_type": "vlan"}},
- {"route_id": "",
- "vl_id": "sfc_data_network",
- "route_external": False,
- "description": "",
- "properties": {"name": "sfc_data_network",
- "dhcp_enabled": True,
- "is_predefined": False,
- "location_info": {"tenant": "admin",
- "vimid": 2,
- "availability_zone": "nova"},
- "ip_version": 4,
- "mtu": 1500,
- "network_name": "sfc_data_network",
- "network_type": "vlan"}}],
- "cps": [{"pnf_id": "m6000_s",
- "vl_id": "path2",
- "description": "",
- "cp_id": "m6000_data_out",
- "properties": {"direction": "bidirectional",
- "vnic_type": "normal",
- "bandwidth": 0,
- "mac_address": "11-22-33-22-11-44",
- "interface_name": "xgei-0/4/1/5",
- "ip_address": "176.1.1.2",
- "order": 0,
- "sfc_encapsulation": "mac"}},
- {"pnf_id": "m6000_s",
- "vl_id": "ext_datanet_net",
- "description": "",
- "cp_id": "m600_tunnel_cp",
- "properties": {"direction": "bidirectional",
- "vnic_type": "normal",
- "bandwidth": 0,
- "mac_address": "00-11-00-22-33-00",
- "interface_name": "gei-0/4/0/13",
- "ip_address": "191.167.100.5",
- "order": 0,
- "sfc_encapsulation": "mac"}},
- {"pnf_id": "m6000_s",
- "vl_id": "path2",
- "description": "",
- "cp_id": "m6000_data_in",
- "properties": {"direction": "bidirectional",
- "vnic_type": "normal",
- "bandwidth": 0,
- "mac_address": "11-22-33-22-11-41",
- "interface_name": "gei-0/4/0/7",
- "ip_address": "1.1.1.1",
- "order": 0,
- "sfc_encapsulation": "mac",
- "bond": "none"}},
- {"pnf_id": "m6000_s",
- "vl_id": "ext_mnet_net",
- "description": "",
- "cp_id": "m600_mnt_cp",
- "properties": {"direction": "bidirectional",
- "vnic_type": "normal",
- "bandwidth": 0,
- "mac_address": "00-11-00-22-33-11",
- "interface_name": "gei-0/4/0/1",
- "ip_address": "10.46.244.51",
- "order": 0,
- "sfc_encapsulation": "mac",
- "bond": "none"}}],
- "metadata": {"invariant_id": "vcpe_ns_sff_1",
- "name": "VCPE_NS",
- "csarVersion": "v1.0",
- "csarType": "NSAR",
- "csarProvider": "ZTE",
- "version": 1,
- "vendor": "ZTE",
- "id": "VCPE_NS",
- "description": "vcpe_ns"},
- "ns": {
- "properties": {
- "descriptor_id": "VCPE_NS",
- "version": 1,
- "name": "VCPE_NS",
- "desginer": "ZTE",
- "invariant_id": "vcpe_ns_sff_1"
- }
- }
- }
+ self.nsd_data = nsd_data
def tearDown(self):
pass