summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lcm/packages/tests/test_nf.py158
-rw-r--r--lcm/packages/tests/test_ns.py150
2 files changed, 154 insertions, 154 deletions
diff --git a/lcm/packages/tests/test_nf.py b/lcm/packages/tests/test_nf.py
index 982373e4..6ddc5b04 100644
--- a/lcm/packages/tests/test_nf.py
+++ b/lcm/packages/tests/test_nf.py
@@ -37,109 +37,109 @@ class TestNfPackage(TestCase):
JobModel.objects.filter().delete()
JobStatusModel.objects.filter().delete()
self.vnfd_raw_data = {
- "rawData":{
- "instance":{
- "metadata":{
- "is_shared":False,
- "plugin_info":"vbrasplugin_1.0",
- "vendor":"zte",
- "request_reclassification":False,
- "name":"vbras",
- "version":1,
- "vnf_type":"vbras",
- "cross_dc":False,
- "vnfd_version":"1.0.0",
- "id":"zte_vbras_1.0",
- "nsh_aware":True
+ "rawData": {
+ "instance": {
+ "metadata": {
+ "is_shared": False,
+ "plugin_info": "vbrasplugin_1.0",
+ "vendor": "zte",
+ "request_reclassification": False,
+ "name": "vbras",
+ "version": 1,
+ "vnf_type": "vbras",
+ "cross_dc": False,
+ "vnfd_version": "1.0.0",
+ "id": "zte_vbras_1.0",
+ "nsh_aware": True
},
- "nodes":[
+ "nodes": [
{
- "id":"aaa_dnet_cp_0xu2j5sbigxc8h1ega3if0ld1",
- "type_name":"tosca.nodes.nfv.ext.zte.CP",
- "template_name":"aaa_dnet_cp",
- "properties":{
- "bandwidth":{
- "type_name":"integer",
- "value":0
+ "id": "aaa_dnet_cp_0xu2j5sbigxc8h1ega3if0ld1",
+ "type_name": "tosca.nodes.nfv.ext.zte.CP",
+ "template_name": "aaa_dnet_cp",
+ "properties": {
+ "bandwidth": {
+ "type_name": "integer",
+ "value": 0
},
- "direction":{
- "type_name":"string",
- "value":"bidirectional"
+ "direction": {
+ "type_name": "string",
+ "value": "bidirectional"
},
- "vnic_type":{
- "type_name":"string",
- "value":"normal"
+ "vnic_type": {
+ "type_name": "string",
+ "value": "normal"
},
- "sfc_encapsulation":{
- "type_name":"string",
- "value":"mac"
+ "sfc_encapsulation": {
+ "type_name": "string",
+ "value": "mac"
},
- "order":{
- "type_name":"integer",
- "value":2
+ "order": {
+ "type_name": "integer",
+ "value": 2
}
},
- "relationships":[
+ "relationships": [
{
- "name":"guest_os",
- "source_requirement_index":0,
- "target_node_id":"AAA_image_d8aseebr120nbm7bo1ohkj194",
- "target_capability_name":"feature"
+ "name": "guest_os",
+ "source_requirement_index": 0,
+ "target_node_id": "AAA_image_d8aseebr120nbm7bo1ohkj194",
+ "target_capability_name": "feature"
}
]
},
{
- "id":"LB_Image_oj5l2ay8l2g6vcq6fsswzduha",
- "type_name":"tosca.nodes.nfv.ext.ImageFile",
- "template_name":"LB_Image",
- "properties":{
- "disk_format":{
- "type_name":"string",
- "value":"qcow2"
+ "id": "LB_Image_oj5l2ay8l2g6vcq6fsswzduha",
+ "type_name": "tosca.nodes.nfv.ext.ImageFile",
+ "template_name": "LB_Image",
+ "properties": {
+ "disk_format": {
+ "type_name": "string",
+ "value": "qcow2"
},
- "file_url":{
- "type_name":"string",
- "value":"/SoftwareImages/image-lb"
+ "file_url": {
+ "type_name": "string",
+ "value": "/SoftwareImages/image-lb"
},
- "name":{
- "type_name":"string",
- "value":"image-lb"
+ "name": {
+ "type_name": "string",
+ "value": "image-lb"
}
}
}
]
},
- "model":{
- "metadata":{
- "is_shared":False,
- "plugin_info":"vbrasplugin_1.0",
- "vendor":"zte",
- "request_reclassification":False,
- "name":"vbras",
- "version":1,
- "vnf_type":"vbras",
- "cross_dc":False,
- "vnfd_version":"1.0.0",
- "id":"zte_vbras_1.0",
- "nsh_aware":True
+ "model": {
+ "metadata": {
+ "is_shared": False,
+ "plugin_info": "vbrasplugin_1.0",
+ "vendor": "zte",
+ "request_reclassification": False,
+ "name": "vbras",
+ "version": 1,
+ "vnf_type": "vbras",
+ "cross_dc": False,
+ "vnfd_version": "1.0.0",
+ "id": "zte_vbras_1.0",
+ "nsh_aware": True
},
- "node_templates":[
+ "node_templates": [
{
- "name":"aaa_dnet_cp",
- "type_name":"tosca.nodes.nfv.ext.zte.CP",
- "default_instances":1,
- "min_instances":0,
- "properties":{
- "bandwidth":{
- "type_name":"integer",
- "value":0
+ "name": "aaa_dnet_cp",
+ "type_name": "tosca.nodes.nfv.ext.zte.CP",
+ "default_instances": 1,
+ "min_instances": 0,
+ "properties": {
+ "bandwidth": {
+ "type_name": "integer",
+ "value": 0
}
},
- "requirement_templates":[
+ "requirement_templates": [
{
- "name":"virtualbinding",
- "target_node_template_name":"AAA",
- "target_capability_name":"virtualbinding"
+ "name": "virtualbinding",
+ "target_node_template_name": "AAA",
+ "target_capability_name": "virtualbinding"
}
]
}
@@ -768,4 +768,4 @@ vims_info = {
}
}
]
-} \ No newline at end of file
+}
diff --git a/lcm/packages/tests/test_ns.py b/lcm/packages/tests/test_ns.py
index 54d7b65b..b49af833 100644
--- a/lcm/packages/tests/test_ns.py
+++ b/lcm/packages/tests/test_ns.py
@@ -28,102 +28,102 @@ class TestNsPackage(TestCase):
NSInstModel.objects.filter().delete()
NfPackageModel.objects.filter().delete()
self.nsd_raw_data = {
- "rawData":{
- "instance":{
- "metadata":{
- "vendor":"ZTE",
- "name":"VBRAS_NS",
- "csarVersion":1,
- "csarType":"NSAR",
- "csarProvider":"ZTE",
- "version":1,
- "invariant_id":"VBRAS_NS_NO_SFC",
- "id":"VBRAS_NS_ZTE_1.0",
- "description":"VBRAS_ZTE_NS"
+ "rawData": {
+ "instance": {
+ "metadata": {
+ "vendor": "ZTE",
+ "name": "VBRAS_NS",
+ "csarVersion": 1,
+ "csarType": "NSAR",
+ "csarProvider": "ZTE",
+ "version": 1,
+ "invariant_id": "VBRAS_NS_NO_SFC",
+ "id": "VBRAS_NS_ZTE_1.0",
+ "description": "VBRAS_ZTE_NS"
},
- "nodes":[
+ "nodes": [
{
- "id":"VBras_yfye7lsgi73p8j4p2a6vbguzd",
- "type_name":"tosca.nodes.nfv.ext.zte.VNF.VBras",
- "template_name":"VBras",
- "properties":{
- "vendor":{
- "type_name":"string",
- "value":"zte"
+ "id": "VBras_yfye7lsgi73p8j4p2a6vbguzd",
+ "type_name": "tosca.nodes.nfv.ext.zte.VNF.VBras",
+ "template_name": "VBras",
+ "properties": {
+ "vendor": {
+ "type_name": "string",
+ "value": "zte"
},
- "name":{
- "type_name":"string",
- "value":"vbras"
+ "name": {
+ "type_name": "string",
+ "value": "vbras"
},
- "version":{
- "type_name":"string",
- "value":"1.0"
+ "version": {
+ "type_name": "string",
+ "value": "1.0"
},
- "vnf_type":{
- "type_name":"string",
- "value":"vbras"
+ "vnf_type": {
+ "type_name": "string",
+ "value": "vbras"
},
- "vnfd_version":{
- "type_name":"string",
- "value":"1.0.0"
+ "vnfd_version": {
+ "type_name": "string",
+ "value": "1.0.0"
},
- "id":{
- "type_name":"string",
- "value":"zte_vbras_1.0"
+ "id": {
+ "type_name": "string",
+ "value": "zte_vbras_1.0"
}
}
}
]
},
- "model":{
- "metadata":{
- "vendor":"ZTE",
- "name":"VBRAS_NS",
- "csarVersion":1,
- "csarType":"NSAR",
- "csarProvider":"ZTE",
- "version":1,
- "invariant_id":"VBRAS_NS_NO_SFC",
- "id":"VBRAS_NS_ZTE_1.0",
- "description":"VBRAS_ZTE_NS"
+ "model": {
+ "metadata": {
+ "vendor": "ZTE",
+ "name": "VBRAS_NS",
+ "csarVersion": 1,
+ "csarType": "NSAR",
+ "csarProvider": "ZTE",
+ "version": 1,
+ "invariant_id": "VBRAS_NS_NO_SFC",
+ "id": "VBRAS_NS_ZTE_1.0",
+ "description": "VBRAS_ZTE_NS"
},
- "node_templates":[
+ "node_templates": [
{
- "name":"VBras",
- "type_name":"tosca.nodes.nfv.ext.zte.VNF.VBras",
- "default_instances":1,
- "min_instances":0,
- "properties":{
- "vendor":{
- "type_name":"string",
- "value":"zte"
+ "name": "VBras",
+ "type_name": "tosca.nodes.nfv.ext.zte.VNF.VBras",
+ "default_instances": 1,
+ "min_instances": 0,
+ "properties": {
+ "vendor": {
+ "type_name": "string",
+ "value": "zte"
},
- "name":{
- "type_name":"string",
- "value":"vbras"
+ "name": {
+ "type_name": "string",
+ "value": "vbras"
},
- "version":{
- "type_name":"string",
- "value":"1.0"
+ "version": {
+ "type_name": "string",
+ "value": "1.0"
},
- "vnf_type":{
- "type_name":"string",
- "value":"vbras"
+ "vnf_type": {
+ "type_name": "string",
+ "value": "vbras"
},
- "vnfd_version":{
- "type_name":"string",
- "value":"1.0.0"
+ "vnfd_version": {
+ "type_name": "string",
+ "value": "1.0.0"
},
- "id":{
- "type_name":"string",
- "value":"zte_vbras_1.0"
+ "id": {
+ "type_name": "string",
+ "value": "zte_vbras_1.0"
}
},
- "requirement_templates":[
+ "requirement_templates": [
{
- "name":"lb_mnet_vl_cp",
- "target_node_template_name":"ext_mnet_net",
- "target_capability_name":"virtual_linkable"
+ "name": "lb_mnet_vl_cp",
+ "target_node_template_name": "ext_mnet_net",
+ "target_capability_name": "virtual_linkable"
}
]
}
@@ -415,4 +415,4 @@ class TestNsPackage(TestCase):
resp = self.client.put("/api/nslcm/v0/nspackage/19/enabled")
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("success", resp.data["status"])
- self.assertEqual("Set operationState to Enabled of CSAR(19) successfully.", resp.data["statusDescription"]) \ No newline at end of file
+ self.assertEqual("Set operationState to Enabled of CSAR(19) successfully.", resp.data["statusDescription"])