X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fconst.py;h=66dae1ea036d46ae9dae4a99a00b3d86feba8a00;hb=d672544f4b8c9a8b181b0f7feb6cf4ff710e0362;hp=f197294a2fc78b0ef9451011890115c1aaadfc4b;hpb=cfd2c2e9e08292e4a4b06bf3185aa6fa17d69e22;p=vfc%2Fgvnfm%2Fvnflcm.git
diff --git a/lcm/lcm/nf/vnfs/const.py b/lcm/lcm/nf/vnfs/const.py
index f197294a..66dae1ea 100644
--- a/lcm/lcm/nf/vnfs/const.py
+++ b/lcm/lcm/nf/vnfs/const.py
@@ -287,240 +287,202 @@ vnfd_rawdata = {
vnfd_model_dict = {
- 'local_storages': [],
+ 'metadata': {
+ 'vendor': u'zte',
+ 'is_shared': False,
+ 'description': '',
+ 'domain_type': u'CN',
+ 'version': u'v4.14.10',
+ 'vmnumber_overquota_alarm': False,
+ 'cross_dc': False,
+ 'vnf_type': u'SSS',
+ 'vnfd_version': u'V00000001',
+ 'id': u'sss-vnf-template',
+ 'name': u'sss-vnf-template'
+ },
'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': ''},
- 'inject_data_list': [],
- 'watchdog': {
- 'action': '',
- 'enabledelay': ''},
- 'local_affinity_antiaffinity_rule': {},
- 'template_id': u'omm.001',
- 'manual_scale_select_vim': False},
- 'description': u'singleommvm'},
- {
- 'volumn_storages': [],
- 'nfv_compute': {
- 'mem_size': '',
- 'num_cpus': u'4'},
- 'local_storages': [],
- 'vdu_id': u'vdu_1',
- 'image_file': u'sss',
- 'dependencies': [],
- 'vls': [],
- 'cps': [],
- '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'1',
- 'manual_scale_select_vim': False},
- 'description': u'ompvm'},
- {
- 'volumn_storages': [],
- 'nfv_compute': {
- 'mem_size': '',
- 'num_cpus': u'14'},
- 'local_storages': [],
- 'vdu_id': u'vdu_2',
- 'image_file': u'sss',
- 'dependencies': [],
- 'vls': [],
- 'cps': [],
- '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'2',
- 'manual_scale_select_vim': False},
- 'description': u'ompvm'},
- {
- 'volumn_storages': [],
- 'nfv_compute': {
- 'mem_size': '',
- 'num_cpus': u'14'},
- 'local_storages': [],
- 'vdu_id': u'vdu_3',
- 'image_file': u'sss',
- 'dependencies': [],
- 'vls': [],
- 'cps': [],
- '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'3',
- 'manual_scale_select_vim': False},
- 'description': u'ompvm'},
- {
- 'volumn_storages': [],
- 'nfv_compute': {
- 'mem_size': '',
- 'num_cpus': u'4'},
- 'local_storages': [],
- 'vdu_id': u'vdu_10',
- 'image_file': u'sss',
- 'dependencies': [],
- 'vls': [],
- 'cps': [],
- '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'10',
- 'manual_scale_select_vim': False},
- 'description': u'ppvm'},
- {
- 'volumn_storages': [],
- 'nfv_compute': {
- 'mem_size': '',
- 'num_cpus': u'14'},
- 'local_storages': [],
- 'vdu_id': u'vdu_11',
- 'image_file': u'sss',
- 'dependencies': [],
- 'vls': [],
- 'cps': [],
- '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'11',
- 'manual_scale_select_vim': False},
- 'description': u'ppvm'},
+ "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"
+ },
+ "local_affinity_antiaffinity_rule": [
+ {
+ "affinity_antiaffinity": "anti-affinity",
+ "scope": "node"
+ },
+ {
+ "affinity_antiaffinity": "affinity",
+ "scope": "zone"
+ }
+ ],
+ "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"
+ },
+ "is_predefined": False,
+ "allow_scale_updown": False,
+ "inject_network_address": True,
+ "inner_hugepage_num": 100,
+ "inner_hugepage_size": "2048",
+ "action": "add"
+ },
+ "image_file": "omm_image",
+ "local_storages": [
+ "local_storage_id1",
+ "local_storage_id2"
+ ],
+ "volume_storages": [
+ {
+ "volume_storage_id": "volume_storage_id1",
+ "location": "/usr/data",
+ "device": "/dev/hda1"
+ }
+ ],
+ "dependencies": [
+ "vdu1Id",
+ "vduNId"
+ ],
+ "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": [
+ "cpId1",
+ "cpIdN"
+ ],
+ "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"
+ }
+ }
+ }
+ },
+ "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': [
{
- 'volumn_storages': [],
- 'nfv_compute': {
- 'mem_size': '',
- 'num_cpus': u'14'},
- 'local_storages': [],
- 'vdu_id': u'vdu_12',
- 'image_file': u'sss',
- 'dependencies': [],
- 'vls': [],
- 'cps': [],
- '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},
- 'description': u'ppvm'}],
- 'volumn_storages': [],
+ "volume_storage_id": "volume_storage1",
+ "description": "",
+ "properties": {
+ "size": "100 GB",
+ "volume_id": "",
+ "volume_name": "volumeStorage1",
+ "custom_volume_type": "type1",
+ "disk_type": "data",
+ "delete_on_termination_vm": True,
+ "location_info": {
+ "vimid": "vimid_1",
+ "tenant": "tenantname_1",
+ "availability_zone": "zone1"
+ },
+ "is_predefined": False,
+ "is_shared": False
+ },
+ "image_file": [
+ "volume_image"
+ ]
+ }
+ ],
'policies': {
'scaling': {
- 'targets': {},
+ 'targets': {
+
+ },
'policy_id': u'policy_scale_sss-vnf-template',
'properties': {
- 'policy_file': '*-vnfd.zip/*-vnf-policy.xml'},
- 'description': ''}},
+ 'policy_file': '*-vnfd.zip/*-vnf-policy.xml'
+ },
+ 'description': ''
+ }
+ },
'image_files': [
{
'description': '',
@@ -531,8 +493,10 @@ vnfd_model_dict = {
'file_url': u'./zte-cn-sss-main-image/OMM/opencos_sss_omm_img_release_20150723-1-disk1.vmdk',
'container_type': 'vm',
'version': '',
- 'hypervisor_type': 'kvm'},
- 'image_file_id': u'opencos_sss_omm_img_release_20150723-1-disk1'},
+ 'hypervisor_type': 'kvm'
+ },
+ 'image_file_id': u'opencos_sss_omm_img_release_20150723-1-disk1'
+ },
{
'description': '',
'properties': {
@@ -542,64 +506,204 @@ vnfd_model_dict = {
'file_url': u'./zte-cn-sss-main-image/NE/sss.vmdk',
'container_type': 'vm',
'version': '',
- 'hypervisor_type': 'kvm'},
- 'image_file_id': u'sss'}],
- 'vls': [],
- 'cps': [],
- 'metadata': {
- 'vendor': u'zte',
- 'is_shared': False,
- 'description': '',
- 'domain_type': u'CN',
- 'version': u'v4.14.10',
- 'vmnumber_overquota_alarm': False,
- 'cross_dc': False,
- 'vnf_type': u'SSS',
- 'vnfd_version': u'V00000001',
- 'id': u'sss-vnf-template',
- 'name': u'sss-vnf-template'},
- "flavourId": "flavour_1",
- "instantiationLevelId": "instantiationLevel_1",
- "extVirtualLinks": [
+ 'hypervisor_type': 'kvm'
+ },
+ 'image_file_id': u'sss'
+ }
+ ],
+ 'vls': [
{
- "vlInstanceId": "1",
- "vim": {
- "vimInfoId": "1",
- "vimId": "1",
- "interfaceInfo": {
- "vimType": "vim",
- "apiVersion": "v2",
- "protocolType": "http"
+ "vl_id": "vldId1",
+ "description": "",
+ "properties": {
+ "name": "umac_241_control",
+ "network_name": "umac_control",
+ "is_predefined": False,
+ "vendor": "zte",
+ "netmask": "255.255.255.0",
+ "mtu": 1500,
+ "network_type": "vlan",
+ "physical_network": "phynet01",
+ "segmentation_id": "30",
+ "vlan_transparent": False,
+ "vds_name": "vds1",
+ "cidr": "192.168.199.0/24",
+ "ip_version": 4,
+ "gateway_ip": "192.168.199.1",
+ "dhcp_enabled": False,
+ "dns_nameservers": [
+ "192.168.0.4",
+ "192.168.0.10"
+ ],
+ "start_ip": "192.168.199.2",
+ "end_ip": "192.168.199.254",
+ "host_routes": [
+ {
+ "destination": "10.43.26.0/24",
+ "nexthop": "10.41.23.1"
+ }
+ ],
+ "location_info": {
+ "vimid": "vimid_1",
+ "tenant": "tenantname_1"
},
- "accessInfo": {
- "tenant": "tenant_vCPE",
- "username": "vCPE",
- "password": "vCPE_321"
+ "cloud_type": "IaaS"
+ },
+ "route_id": "router01",
+ "route_external": False
+ }
+ ],
+ 'cps': [
+ {
+ "cp_id": "cpId",
+ "description": "",
+ "properties": {
+ "name": "",
+ "mac_address": "00:d9:00:82:11:e1",
+ "ip_address:": "192.168.1.21",
+ "ip_range_start": "192.168.1.20",
+ "ip_range_end": "192.168.1.29",
+ "floating_ip_address": {
+ "external_network": "extnet01",
+ "ip_address": "10.43.53.23"
},
- "interfaceEndpoint": "http://10.43.21.105:80/"
+ "service_ip_address": "192.168.1.23",
+ "order": 1,
+ "bandwidth": 1000,
+ "vnic_type": "normal",
+ "allowed_address_pairs": [
+ {
+ "ip": "192.168.1.13",
+ "mac": "00:f3:43:20:a2:a3"
+ }
+ ],
+ "bond": "none",
+ "bond_index": 1,
+ "macbond": "00:d9:00:82:11:d1",
+ "sfc_encapsulation": "",
+ "direction": "",
+ "gateway_ip": "192.168.199.1",
+ "netmask": "255.255.255.0",
+ "interface_name": "fe-01-02",
+ "is_virtual": False,
+ "function": "control"
},
- "resourceId": "1246",
- "extCps": [
- {
- "cpdId": "11",
- "addresses": [
- {
- "addressType": "MAC",
- "l2AddressData": "00:f3:43:20:a2:a3"
- },
- {
- "addressType": "IP",
- "l3AddressData": {
- "iPAddressType": "IPv4",
- "iPAddress": "192.168.104.2"
- }
- }
- ],
- "numDynamicAddresses": 0
- }
- ]
+ "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"
}
],
- "localizationLanguage": "en_US",
- "additionalParams": {}
+ "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