diff options
| -rwxr-xr-x | vid-app-common/pom.xml | 2 | ||||
| -rw-r--r-- | vid-app-common/src/main/resources/sdcservices.json | 14 | ||||
| -rw-r--r-- | vid-app-common/src/main/resources/vLoadBalancerMS-with-policy.TOSCA.zip | bin | 0 -> 127525 bytes | |||
| -rw-r--r-- | vid-app-common/src/test/java/org/onap/vid/asdc/parser/ToscaParserImpl2Test.java | 1 | ||||
| -rw-r--r-- | vid-app-common/src/test/resources/vLoadBalancerMS-with-policy.TOSCA.json | 251 |
5 files changed, 267 insertions, 1 deletions
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml index d3c6fbeeb..c4dabed98 100755 --- a/vid-app-common/pom.xml +++ b/vid-app-common/pom.xml @@ -765,7 +765,7 @@ <dependency> <groupId>org.onap.sdc.sdc-tosca</groupId> <artifactId>sdc-tosca</artifactId> - <version>1.4.7</version> + <version>1.5.1</version> <scope>compile</scope> </dependency> <dependency> diff --git a/vid-app-common/src/main/resources/sdcservices.json b/vid-app-common/src/main/resources/sdcservices.json index 965c9cebd..12142aa9b 100644 --- a/vid-app-common/src/main/resources/sdcservices.json +++ b/vid-app-common/src/main/resources/sdcservices.json @@ -71,6 +71,20 @@ "resources": null }, { + "uuid": "3f6bd9e9-0942-49d3-84e8-6cdccd6de339", + "invariantUUID": "5461e83e-0b2a-465d-ab45-9d731894afd9", + "name": "vLoadBalancerMS", + "version": "1.0", + "toscaModelURL": "./vLoadBalancerMS-with-policy.TOSCA.zip", + "category": "Network L4+", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "demo", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { "uuid": "90fe6842-aa76-4b68-8329-5c86ff564407", "invariantUUID": "0311f998-9268-4fd6-bbba-afff15087b72", "name": "4-27_vMME_Service", diff --git a/vid-app-common/src/main/resources/vLoadBalancerMS-with-policy.TOSCA.zip b/vid-app-common/src/main/resources/vLoadBalancerMS-with-policy.TOSCA.zip Binary files differnew file mode 100644 index 000000000..ef77d2515 --- /dev/null +++ b/vid-app-common/src/main/resources/vLoadBalancerMS-with-policy.TOSCA.zip diff --git a/vid-app-common/src/test/java/org/onap/vid/asdc/parser/ToscaParserImpl2Test.java b/vid-app-common/src/test/java/org/onap/vid/asdc/parser/ToscaParserImpl2Test.java index 6e99b5ca9..91c480526 100644 --- a/vid-app-common/src/test/java/org/onap/vid/asdc/parser/ToscaParserImpl2Test.java +++ b/vid-app-common/src/test/java/org/onap/vid/asdc/parser/ToscaParserImpl2Test.java @@ -320,6 +320,7 @@ public class ToscaParserImpl2Test { // new ToscaParserMockHelper(Constants.fabricConfigurationUuid, Constants.fabricConfigurationFilePath), // new ToscaParserMockHelper(Constants.vlanTaggingUuid, Constants.vlanTaggingFilePath), // new ToscaParserMockHelper(Constants.vnfGroupingUuid, Constants.vnfGroupingFilePath) + new ToscaParserMockHelper("3f6bd9e9-0942-49d3-84e8-6cdccd6de339", "./vLoadBalancerMS-with-policy.TOSCA.json"), }; return mockHelpers; diff --git a/vid-app-common/src/test/resources/vLoadBalancerMS-with-policy.TOSCA.json b/vid-app-common/src/test/resources/vLoadBalancerMS-with-policy.TOSCA.json new file mode 100644 index 000000000..65caeee2d --- /dev/null +++ b/vid-app-common/src/test/resources/vLoadBalancerMS-with-policy.TOSCA.json @@ -0,0 +1,251 @@ +{ + "service": { + "uuid": "3f6bd9e9-0942-49d3-84e8-6cdccd6de339", + "invariantUuid": "5461e83e-0b2a-465d-ab45-9d731894afd9", + "name": "vLoadBalancerMS", + "version": "1.0", + "toscaModelURL": null, + "category": "Network L4+", + "serviceType": "", + "serviceRole": "", + "description": "vLBMS", + "serviceEcompNaming": "true", + "instantiationType": "A-La-Carte", + "inputs": {} + }, + "vnfs": { + "vLoadBalancerMS 0": { + "uuid": "7759af67-ba6c-4089-bdb6-85c4e365e8d5", + "invariantUuid": "9cc2e84b-1d3f-4c1c-90a8-765eb6ddb5fe", + "description": "vLBMS", + "name": "vLoadBalancerMS", + "version": "1.0", + "customizationUuid": "595eb007-1473-46c2-8d6d-c5294335ef0e", + "inputs": {}, + "commands": {}, + "properties": { + "vlb_int_pktgen_private_ip_0": "192.168.9.111", + "vlb_private_net_cidr": "192.168.10.0/24", + "vlb_private_net_id": "zdfw1lb01_private", + "vdns_onap_private_ip_0": "ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VDNS", + "vdns_image_name": "PUT THE IMAGE NAME HERE (UBUNTU 1604)", + "public_net_id": "PUT THE NETWORK ID HERE", + "sec_group": "PUT THE ONAP SECURITY GROUP HERE", + "nf_type": "LOADBALANCER", + "onap_private_net_cidr": "PUT THE ONAP NETWORK CIDR HERE", + "nexus_artifact_repo": "https://nexus.onap.org", + "vpg_onap_private_ip_0": "ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VPKTGEN", + "vlb_0_mac_address": "00:00:00:00:00", + "vdns_int_private_ip_0": "192.168.10.212", + "vdns_name_0": "zdfw1lb01dns01", + "dcae_collector_ip": "10.0.4.1", + "vpg_name_0": "zdfw1lb01pg01", + "vip": "192.168.9.112", + "int_private_net_id": "vLBMS_zdfw1lb01_private", + "nf_naming": "{ecomp_generated_naming=true}", + "vpg_0_mac_address": "00:00:00:00:00", + "multi_stage_design": "false", + "nf_naming_code": "ONAP-LOADBALANCER", + "onap_private_net_id": "PUT THE ONAP PRIVATE NETWORK NAME HERE", + "sdnc_artifact_name": "LOADBALANCER", + "demo_artifacts_version": "1.4.0-SNAPSHOT", + "vlb_int_private_ip_0": "192.168.10.111", + "key_name": "vlb_key", + "int_private_subnet_id": "vLBMS_zdfw1lb01_private_subnet", + "vlb_name_0": "zdfw1lb01lb01", + "sdnc_model_version": "1.0.0", + "vpg_0_int_pktgen_private_port_0_mac": "fa:16:3e:00:20", + "install_script_version": "1.4.0-SNAPSHOT", + "int_pktgen_private_net_id": "vLBMS_zdfw1pktgen01_private", + "vf_module_id": "vLoadBalancer", + "skip_post_instantiation_configuration": "true", + "nf_function": "vlb", + "vnf_name": "vLBMS", + "keypair": "vlb_key", + "ecomp_generated_naming": "true", + "onap_private_subnet_id": "PUT THE ONAP PRIVATE NETWORK NAME HERE", + "gre_ipaddr": "192.168.10.112", + "pg_int": "192.168.9.109", + "vnf_id": "vLoadBalancer_demo_app", + "vpg_flavor_name": "PUT THE FLAVOR NAME HERE (m1.medium suggested)", + "dcae_collector_port": "30235", + "vlb_flavor_name": "PUT THE FLAVOR NAME HERE (m1.medium suggested)", + "pktgen_private_net_cidr": "192.168.9.0/24", + "vpg_image_name": "PUT THE IMAGE NAME HERE (UBUNTU 1604)", + "vdns_flavor_name": "PUT THE FLAVOR NAME HERE (m1.medium suggested)", + "availability_zone_max_count": "1", + "nb_api_version": "1.2.0", + "vpg_int_pktgen_private_ip_0": "192.168.9.110", + "pub_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN", + "int_pktgen_private_subnet_id": "vLBMS_zdfw1pktgen01_private_subnet", + "pktgen_private_net_id": "zdfw1pktgen01_private", + "nf_role": "vLB", + "vlb_onap_private_ip_0": "PUT THE PRIVATE ADDRESS OF THE VLB IN THE ONAP NETWORK SPACE HERE", + "sdnc_model_name": "vLB", + "cloud_env": "PUT openstack OR rackspace HERE", + "vlb_image_name": "PUT THE IMAGE NAME HERE (UBUNTU 1604)", + "vlb_0_int_pktgen_private_port_0_mac": "fa:16:3e:00:10" + }, + "type": "VF", + "modelCustomizationName": "vLoadBalancerMS 0", + "vfModules": { + "vloadbalancerms0..Vloadbalancerms..vpkg..module-1": { + "uuid": "72d56b5c-932c-48d7-9b74-b0f6c30d221b", + "invariantUuid": "af73061a-f54c-42e6-bfa3-fabaafbbbcab", + "customizationUuid": "be7b0c7a-891a-4d1d-956a-2a13476c05b4", + "description": null, + "name": "Vloadbalancerms..vpkg..module-1", + "version": "1", + "modelCustomizationName": "Vloadbalancerms..vpkg..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "vpkg", + "baseModule": false + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "vloadbalancerms0..Vloadbalancerms..base_template..module-0": { + "uuid": "cb220ca2-0a2a-4150-a2fb-62a0d0c6ffb7", + "invariantUuid": "793811b5-bc70-4550-8924-357a4d61c7b1", + "customizationUuid": "ae9ee878-fcbd-4e37-9c2e-c2b49de06e2b", + "description": null, + "name": "Vloadbalancerms..base_template..module-0", + "version": "1", + "modelCustomizationName": "Vloadbalancerms..base_template..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_template", + "baseModule": true + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "vloadbalancerms0..Vloadbalancerms..vdns..module-3": { + "uuid": "486bf5bf-6eff-430d-987e-f074747329f3", + "invariantUuid": "0b2fbfc6-157a-4b97-933d-a3ed9eff6402", + "customizationUuid": "468f3002-26cd-44a3-96ed-e45e8fc5a0c5", + "description": null, + "name": "Vloadbalancerms..vdns..module-3", + "version": "1", + "modelCustomizationName": "Vloadbalancerms..vdns..module-3", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "vdns", + "baseModule": false + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "vloadbalancerms0..Vloadbalancerms..vlb..module-2": { + "uuid": "0a115dbb-f92d-4a66-b867-9e725e45f104", + "invariantUuid": "ddc25d0c-d4e9-4ff5-ba3b-59fb8c0c3d76", + "customizationUuid": "c580f9c9-1455-4c5f-84c0-776776f2e9ca", + "description": null, + "name": "Vloadbalancerms..vlb..module-2", + "version": "1", + "modelCustomizationName": "Vloadbalancerms..vlb..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "vlb", + "baseModule": false + }, + "inputs": {}, + "volumeGroupAllowed": false + } + }, + "volumeGroups": {}, + "vfcInstanceGroups": {} + } + }, + "networks": {}, + "collectionResource": {}, + "configurations": {}, + "fabricConfigurations": {}, + "serviceProxies": {}, + "vfModules": { + "vloadbalancerms0..Vloadbalancerms..vpkg..module-1": { + "uuid": "72d56b5c-932c-48d7-9b74-b0f6c30d221b", + "invariantUuid": "af73061a-f54c-42e6-bfa3-fabaafbbbcab", + "customizationUuid": "be7b0c7a-891a-4d1d-956a-2a13476c05b4", + "description": null, + "name": "Vloadbalancerms..vpkg..module-1", + "version": "1", + "modelCustomizationName": "Vloadbalancerms..vpkg..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "vpkg", + "baseModule": false + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "vloadbalancerms0..Vloadbalancerms..vdns..module-3": { + "uuid": "486bf5bf-6eff-430d-987e-f074747329f3", + "invariantUuid": "0b2fbfc6-157a-4b97-933d-a3ed9eff6402", + "customizationUuid": "468f3002-26cd-44a3-96ed-e45e8fc5a0c5", + "description": null, + "name": "Vloadbalancerms..vdns..module-3", + "version": "1", + "modelCustomizationName": "Vloadbalancerms..vdns..module-3", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "vdns", + "baseModule": false + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "vloadbalancerms0..Vloadbalancerms..base_template..module-0": { + "uuid": "cb220ca2-0a2a-4150-a2fb-62a0d0c6ffb7", + "invariantUuid": "793811b5-bc70-4550-8924-357a4d61c7b1", + "customizationUuid": "ae9ee878-fcbd-4e37-9c2e-c2b49de06e2b", + "description": null, + "name": "Vloadbalancerms..base_template..module-0", + "version": "1", + "modelCustomizationName": "Vloadbalancerms..base_template..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_template", + "baseModule": true + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "vloadbalancerms0..Vloadbalancerms..vlb..module-2": { + "uuid": "0a115dbb-f92d-4a66-b867-9e725e45f104", + "invariantUuid": "ddc25d0c-d4e9-4ff5-ba3b-59fb8c0c3d76", + "customizationUuid": "c580f9c9-1455-4c5f-84c0-776776f2e9ca", + "description": null, + "name": "Vloadbalancerms..vlb..module-2", + "version": "1", + "modelCustomizationName": "Vloadbalancerms..vlb..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "vlb", + "baseModule": false + }, + "inputs": {}, + "volumeGroupAllowed": false + } + }, + "volumeGroups": {}, + "pnfs": {}, + "vnfGroups": {} +}
\ No newline at end of file |