X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fconst.py;h=66dae1ea036d46ae9dae4a99a00b3d86feba8a00;hb=d672544f4b8c9a8b181b0f7feb6cf4ff710e0362;hp=b9c0733b4df5ec3905a29c65e308426d51e42975;hpb=33e38547c8345726d995318c46655ec5ffc81184;p=vfc%2Fgvnfm%2Fvnflcm.git
diff --git a/lcm/lcm/nf/vnfs/const.py b/lcm/lcm/nf/vnfs/const.py
index b9c0733b..66dae1ea 100644
--- a/lcm/lcm/nf/vnfs/const.py
+++ b/lcm/lcm/nf/vnfs/const.py
@@ -302,106 +302,149 @@ vnfd_model_dict = {
},
'vdus': [
{
- 'volumn_storages': [
-
- ],
- 'nfv_compute': {
- 'mem_size': '',
- 'num_cpus': u'2'
- },
- 'local_storages': [
-
- ],
- 'vdu_id': u'vdu_omm.001',
- 'image_file': u'opencos_sss_omm_img_release_20150723-1-disk1',
- 'dependencies': [
-
- ],
- 'vls': [
-
- ],
- 'cps': [
-
- ],
- 'properties': {
- 'key_vdu': '',
- 'support_scaling': False,
- 'vdu_type': '',
- 'name': '',
- 'storage_policy': '',
- 'location_info': {
- 'vimId': '',
- 'availability_zone': '',
- 'region': '',
- 'dc': '',
- 'host': '',
- 'tenant': ''
+ "vdu_id": "vdu1Id",
+ "description": "vdu description",
+ "properties": {
+ "name": "vduinstname",
+ "vdu_type": "OMP",
+ "key_vdu": True,
+ "support_scaling": True,
+ "location_info": {
+ "vimid": "vimid",
+ "tenant": "tenantname",
+ "availability_zone": "zone1",
+ "host": "host1"
},
- 'inject_data_list': [
-
+ "local_affinity_antiaffinity_rule": [
+ {
+ "affinity_antiaffinity": "anti-affinity",
+ "scope": "node"
+ },
+ {
+ "affinity_antiaffinity": "affinity",
+ "scope": "zone"
+ }
],
- 'watchdog': {
- 'action': '',
- 'enabledelay': ''
- },
- 'local_affinity_antiaffinity_rule': {
-
+ "inject_data_list": [
+ {
+ "file_name": "abc.xml",
+ "file_data": "xxxssss"
+ }
+ ],
+ "storage_policy": "HIGH",
+ "template_id": "26",
+ "manual_scale_select_vim": False,
+ "watchdog": {
+ "enabledelay": 600000,
+ "action": "reset"
},
- 'template_id': u'omm.001',
- 'manual_scale_select_vim': False
+ "is_predefined": False,
+ "allow_scale_updown": False,
+ "inject_network_address": True,
+ "inner_hugepage_num": 100,
+ "inner_hugepage_size": "2048",
+ "action": "add"
},
- 'description': u'singleommvm'
- },
- {
- 'volumn_storages': [
-
+ "image_file": "omm_image",
+ "local_storages": [
+ "local_storage_id1",
+ "local_storage_id2"
],
- 'nfv_compute': {
- 'mem_size': '',
- 'num_cpus': u'14'
- },
- 'local_storages': [
-
+ "volume_storages": [
+ {
+ "volume_storage_id": "volume_storage_id1",
+ "location": "/usr/data",
+ "device": "/dev/hda1"
+ }
],
- 'vdu_id': u'vdu_12',
- 'image_file': u'sss',
- 'dependencies': [
-
+ "dependencies": [
+ "vdu1Id",
+ "vduNId"
],
- 'vls': [
-
+ "nfv_compute": {
+ "num_cpus": 4,
+ "mem_size": "1024MB",
+ "cpu_frequency": "1GHz",
+ "flavor_extra_specs": {
+ "hw: cpu_policy": "shared",
+ "hw: cpu_max_threads": 50,
+ "hw: cpu_sockets": 10,
+ "hw: cpu_max_sockets": 20,
+ "hw: cpu_max_cores": 8,
+ "hw: cpu_threads": 30,
+ "hw: numa_mem.0": 12288,
+ "hw: hugepage_num": 100,
+ "hw: high_performance": "dvs_high",
+ "hw: numa_nodes": 1,
+ "hw: numa_cpus.0": "2,4,8",
+ "hw: numa_pci": True,
+ "hw: cpu_cores": 4,
+ "pci_passthrough: alias": "ColetoCreek: 1",
+ "hw: mem_page_size": "large",
+ "hw: mem_paging_mechanism": "EPT"
+ }
+ },
+ "vls": [
+ "vlId1",
+ "vlIdN"
],
- 'cps': [
-
+ "cps": [
+ "cpId1",
+ "cpIdN"
],
- 'properties': {
- 'key_vdu': '',
- 'support_scaling': False,
- 'vdu_type': '',
- 'name': '',
- 'storage_policy': '',
- 'location_info': {
- 'vimId': '',
- 'availability_zone': '',
- 'region': '',
- 'dc': '',
- 'host': '',
- 'tenant': ''
- },
- 'inject_data_list': [
-
- ],
- 'watchdog': {
- 'action': '',
- 'enabledelay': ''
- },
- 'local_affinity_antiaffinity_rule': {
-
- },
- 'template_id': u'12',
- 'manual_scale_select_vim': False
+ "scalable": {
+ "min_instances": 1,
+ "max_instances": 2,
+ "default_instances": 1
+ },
+ "interfaces": {
+ "Standard": {
+ "create": {
+ "implementation": "",
+ "inputs": {
+ "param1Name": "value1",
+ "paramNName": "valueN"
+ }
+ },
+ "configure": {
+ "implementation": "",
+ "inputs": {
+ "param1Name": "value1",
+ "paramNName": "valueN"
+ }
+ },
+ "start": {
+ "implementation": "",
+ "inputs": {
+ "param1Name": "value1",
+ "paramNName": "valueN"
+ }
+ },
+ "stop": {
+ "implementation": "",
+ "inputs": {
+ "param1Name": "value1",
+ "paramNName": "valueN"
+ }
+ },
+ "delete": {
+ "implementation": "",
+ "inputs": {
+ "param1Name": "value1",
+ "paramNName": "valueN"
+ }
+ }
+ }
},
- 'description': u'ppvm'
+ "artifacts": [
+ {
+ "artifact_name": "software_version_file",
+ "type": "tosca.artifacts.Deployment",
+ "file": "AppSoftwares/zte-cn-xgw-V5.16.11_NFV-version.zip",
+ "repository": "",
+ "deploy_path": ""
+ }
+ ]
}
],
'volume_storages': [
@@ -501,8 +544,8 @@ vnfd_model_dict = {
}
],
"location_info": {
- "vimid": "vimid",
- "tenant": "tenantname"
+ "vimid": "vimid_1",
+ "tenant": "tenantname_1"
},
"cloud_type": "IaaS"
},
@@ -545,11 +588,122 @@ vnfd_model_dict = {
"is_virtual": False,
"function": "control"
},
- "vl_id": "vlid1",
- "vdu_id": "vdu_id1"
+ "vl_id": "vldId1",
+ "vdu_id": "vdu1Id"
}
],
'local_storages': [
],
+}
+
+c1_data_get_tenant_id = { # get_tenant_id
+ "tenants": [
+ {
+ "id": "1",
+ "name": "tenantname_1"
+ }
+ ]
+}
+c2_data_create_volume = {
+ "id": "4bd3e9eb-cd8b-456a-8589-910836a0ab31",
+ "name": "volume1",
+ "returnCode": 1,
+ "vimId": "vim_volume_1",
+ "vimName": "vim_volume_1",
+ "tenantId": "vim_volume_1",
+ "volumeType": "123",
+ "availabilityZone": "availabilityZone",
+ "status": "availuable",
+ "createTime": "2015-12-02T06:39:40.000000",
+ "type": None,
+ "size": 40
+}
+c3_data_get_volume = { # get_volume
+ "status": "available",
+ "name": "wangsong",
+ "attachments": [
+ {
+ "device": "/dev/vdc",
+ "serverId": "3030e666-528e-4954-88f5-cc21dab1262b",
+ "volumeId": "4bd3e9eb-cd8b-456a-8589-910836a0ab31",
+ "hostName": None,
+ "id": "4bd3e9eb-cd8b-456a-8589-910836a0ab31"
+ }
+ ],
+ "createTime": "2015-12-02T06:39:40.000000",
+ "type": None,
+ "id": "4bd3e9eb-cd8b-456a-8589-910836a0ab31",
+ "size": 40
+}
+c4_data_create_network = { # create_network
+ "returnCode": 0,
+ "vimId": "11111",
+ "vimName": "11111",
+ "status": "ACTIVE",
+ "id": "3c9eebdbbfd345658269340b9ea6fb73",
+ "name": "net1",
+ "tenantId": "tenant1",
+ "networkName": "ommnet",
+ "shared": True,
+ "vlanTransparent": True,
+ "networkType": "vlan",
+ "segmentationId": 202,
+ "physicalNetwork": "ctrl",
+ "routerExternal": False
+}
+c5_data_create_subnet = {
+ "returnCode": 0,
+ "vimId": "11111",
+ "vimName": "11111",
+ "status": " ACTIVE",
+ "id": "d62019d3-bc6e-4319-9c1d-6722fc136a23",
+ "tenantId": "tenant1",
+ "networkId": "d32019d3-bc6e-4319-9c1d-6722fc136a22",
+ "networkName": "networkName",
+ "name": "subnet1",
+ "cidr": "10.43.35.0/24",
+ "ipVersion": 4,
+ "enableDhcp": 1,
+ "gatewayIp": "10.43.35.1",
+ "dnsNameservers": [],
+ "allocationPools": [
+ {
+ "start": "192.168.199.2",
+ "end": "192.168.199.254"
+ }
+ ],
+ "hostRoutes": []
+}
+c6_data_create_port = {
+ "returnCode": 0,
+ "vimId": "11111",
+ "vimName": "11111",
+ "status": " ACTIVE",
+ "id": " 872019d3-bc6e-4319-9c1d-6722fc136afg",
+ "tenantId": "tenant1",
+ "name": "subnet1",
+ "networkId": "d32019d3-bc6e-4319-9c1d-6722fc136a22",
+ "networkName": "networkName",
+ "subnetId": "d62019d3-bc6e-4319-9c1d-6722fc136a23",
+ "subnetName": "subnet1",
+ "macAddress": "212.12.61.23",
+ "ip": "10.43.38.11",
+ "vnicType": "normal",
+ "securityGroups": ""
+}
+c1_data_create_flavor ={
+ "returnCode": 0,
+ "vimId": "11111",
+ "vimName": "11111",
+ "id": "142019d3-bc6e-4319-9c1d-6722fc136afg",
+ "tenantId": "tenant1",
+ "name": "subnet1",
+ "vcpu": 5,
+ "memory": 2,
+ "disk": 40,
+ "ephemeral": 40,
+ "swap": 20,
+ "isPublic": True,
+ "extraSpecs": "testtt"
}
\ No newline at end of file