Merge automation from ECOMP's repository
Reference commit in ECOMP: 8e92a8c6
Issue-ID: VID-378
Change-Id: Ia32f4813378ef95097f788246aa5b1172e20ca48
Signed-off-by: Ittay Stern <ittay.stern@att.com>
diff --git a/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json
new file mode 100644
index 0000000..785635c
--- /dev/null
+++ b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json
@@ -0,0 +1,454 @@
+{
+ "service": {
+ "vidNotions": {
+ "instantiationUI": "legacy",
+ "modelCategory": "other",
+ "viewEditUI": "legacy"
+ },
+ "uuid": "43f13072-fe50-496b-b673-7af075d10143",
+ "invariantUuid": "35fb95d8-d1f0-4e46-99ac-e01b423e8e3f",
+ "name": "PASQUALE vMX VPE BV Service 488 test",
+ "version": "1.0",
+ "toscaModelURL": null,
+ "category": "Network L1-3",
+ "serviceType": "",
+ "serviceRole": "",
+ "description": "Model Creation for PID 291247b . OAM Network Service Name : PASQUALE vPE Tenant OAM Network 1 SRIOV Network Service Name : vPE PASQUALE Provider Net 1",
+ "serviceEcompNaming": "true",
+ "instantiationType": "ClientConfig",
+ "inputs": {
+ "2017488PASQUALEvpe20_ASN": {
+ "type": "string",
+ "description": "AV/PE",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "AV_vPE"
+ },
+ "2017488PASQUALEvpe20_bandwidth": {
+ "type": "string",
+ "description": "Requested VPE bandwidth",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "10"
+ },
+ "2017488PASQUALEvpe20_bandwidth_units": {
+ "type": "string",
+ "description": "Units of bandwidth",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "Gbps"
+ },
+ "2017488PASQUALEvpe20_AIC_CLLI": {
+ "type": "string",
+ "description": "AIC Site CLLI",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "ATLMY8GA"
+ },
+ "2017488PASQUALEvpe20_vnf_config_template_version": {
+ "type": "string",
+ "description": "VPE Software Version",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "17.2"
+ },
+ "2017488PASQUALEvpe20_vnf_instance_name": {
+ "type": "string",
+ "description": "The hostname assigned to the vpe.",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "mtnj309me6"
+ }
+ }
+ },
+ "vnfs": {
+ "2017 488 PASQUALE vPE 2 0": {
+ "uuid": "079266b1-fcf5-44ae-bc04-cc3215b28737",
+ "invariantUuid": "e2dcd546-e647-4854-9ed9-e0a4d6880636",
+ "description": "Name PASQUALE vPE Description The Provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release code 17.2 Owners Mary Fragale Updated 9-25-17 for version 8.0 of the VLM ",
+ "name": "2017 488 PASQUALE vPE 2",
+ "version": "4.0",
+ "customizationUuid": "2b4e9125-b607-49a3-81c7-9260f8ca32f4",
+ "inputs": {
+ "vnf_config_template_version": {
+ "type": "string",
+ "description": "VPE Software Version",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "17.2"
+ },
+ "bandwidth_units": {
+ "type": "string",
+ "description": "Units of bandwidth",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "Gbps"
+ },
+ "bandwidth": {
+ "type": "string",
+ "description": "Requested VPE bandwidth",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "10"
+ },
+ "AIC_CLLI": {
+ "type": "string",
+ "description": "AIC Site CLLI",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "ATLMY8GA"
+ },
+ "ASN": {
+ "type": "string",
+ "description": "AV/PE",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "AV_vPE"
+ },
+ "vnf_instance_name": {
+ "type": "string",
+ "description": "The hostname assigned to the vpe.",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "mtnj309me6"
+ }
+ },
+ "commands": {
+ "vnf_config_template_version": {
+ "displayName": "vnf_config_template_version",
+ "command": "get_input",
+ "inputName": "2017488PASQUALEvpe20_vnf_config_template_version"
+ },
+ "bandwidth_units": {
+ "displayName": "bandwidth_units",
+ "command": "get_input",
+ "inputName": "2017488PASQUALEvpe20_bandwidth_units"
+ },
+ "bandwidth": {
+ "displayName": "bandwidth",
+ "command": "get_input",
+ "inputName": "2017488PASQUALEvpe20_bandwidth"
+ },
+ "AIC_CLLI": {
+ "displayName": "AIC_CLLI",
+ "command": "get_input",
+ "inputName": "2017488PASQUALEvpe20_AIC_CLLI"
+ },
+ "ASN": {
+ "displayName": "ASN",
+ "command": "get_input",
+ "inputName": "2017488PASQUALEvpe20_ASN"
+ },
+ "vnf_instance_name": {
+ "displayName": "vnf_instance_name",
+ "command": "get_input",
+ "inputName": "2017488PASQUALEvpe20_vnf_instance_name"
+ }
+ },
+ "properties": {
+ "vmxvre_retype": "RE-VMX",
+ "vnf_config_template_version": "get_input:2017488PASQUALEvpe20_vnf_config_template_version",
+ "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
+ "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
+ "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
+ "int_ctl_net_name": "VMX-INTXI",
+ "vmx_int_ctl_prefix": "10.0.0.10",
+ "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
+ "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
+ "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
+ "nf_type": "vPE",
+ "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
+ "is_AVPN_service": "false",
+ "vmx_RSG_name": "vREXI-affinity",
+ "vmx_int_ctl_forwarding": "l2",
+ "vmxvre_oam_ip_0": "10.0.0.10",
+ "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
+ "vmxvpfe_sriov41_0_port_vlanstrip": "false",
+ "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
+ "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
+ "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
+ "vmxvre_instance": "0",
+ "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
+ "vmxvre_flavor_name": "ns.c1r16d32.v5",
+ "vmxvpfe_volume_size_0": "40.0",
+ "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
+ "nf_naming": "{ecomp_generated_naming=true}",
+ "multi_stage_design": "false",
+ "nf_naming_code": "tvpr",
+ "vmxvre_name_0": "vREXI",
+ "vmxvpfe_sriov42_0_port_vlanstrip": "false",
+ "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
+ "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
+ "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
+ "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
+ "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
+ "vmxvre_console": "vidconsole",
+ "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
+ "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
+ "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
+ "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
+ "vmxvpfe_sriov44_0_port_vlanstrip": "false",
+ "vf_module_id": "123",
+ "nf_function": "Firewall",
+ "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
+ "vmxvre_int_ctl_ip_0": "10.0.0.10",
+ "ecomp_generated_naming": "true",
+ "AIC_CLLI": "get_input:2017488PASQUALEvpe20_AIC_CLLI",
+ "vnf_name": "mtnj309me6vre",
+ "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
+ "vmxvre_volume_type_1": "HITACHI",
+ "vmxvpfe_sriov44_0_port_broadcastallow": "true",
+ "vmxvre_volume_type_0": "HITACHI",
+ "vmxvpfe_volume_type_0": "HITACHI",
+ "vmxvpfe_sriov43_0_port_broadcastallow": "true",
+ "bandwidth_units": "get_input:2017488PASQUALEvpe20_bandwidth_units",
+ "vnf_id": "123",
+ "vmxvre_oam_prefix": "24",
+ "availability_zone_0": "mtpocfo-kvm-az01",
+ "ASN": "get_input:2017488PASQUALEvpe20_ASN",
+ "vmxvre_chassis_i2cid": "161",
+ "vmxvpfe_name_0": "vPFEXI",
+ "bandwidth": "get_input:2017488PASQUALEvpe20_bandwidth",
+ "availability_zone_max_count": "1",
+ "vmxvre_volume_size_0": "45.0",
+ "vmxvre_volume_size_1": "50.0",
+ "vmxvpfe_sriov42_0_port_broadcastallow": "true",
+ "vmxvre_oam_gateway": "10.0.0.10",
+ "vmxvre_volume_name_1": "vREXI_FAVolume",
+ "vmxvre_ore_present": "0",
+ "vmxvre_volume_name_0": "vREXI_FBVolume",
+ "vmxvre_type": "0",
+ "vnf_instance_name": "get_input:2017488PASQUALEvpe20_vnf_instance_name",
+ "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
+ "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
+ "vmx_int_ctl_len": "24",
+ "vmxvpfe_sriov43_0_port_vlanstrip": "false",
+ "vmxvpfe_sriov41_0_port_broadcastallow": "true",
+ "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
+ "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
+ "nf_role": "MIS",
+ "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
+ "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
+ "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
+ },
+ "type": "VF",
+ "modelCustomizationName": "2017 488 PASQUALE vPE 2 0",
+ "vfModules": {
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": {
+ "uuid": "13bea14d-9405-43c6-920b-97bab64b6a01",
+ "invariantUuid": "83dc51de-a337-498e-9fee-763603a057b4",
+ "customizationUuid": "a90865d5-6de0-4ef8-bf53-d45fa3edddfc",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "properties": {
+ "minCountInstances": null,
+ "maxCountInstances": null,
+ "initialCount": null,
+ "vfModuleLabel": "PASQUALE_vPFE_BV",
+ "baseModule" : false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": true
+ },
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": {
+ "uuid": "3f6d5e51-a9a0-4c53-bb6d-be836767d96f",
+ "invariantUuid": "54466b6d-e33c-4f4d-87e2-32bc5b103589",
+ "customizationUuid": "dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "PASQUALE_vRE_BV",
+ "baseModule" : false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": true
+ },
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0": {
+ "uuid": "0a45a870-3a19-4238-a72a-eadfc583d4fe",
+ "invariantUuid": "c636b302-fba2-4ed7-9f3b-c99715b6bb2e",
+ "customizationUuid": "a0b634e6-514e-4977-91dd-3b8c295e6bc8",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0",
+ "properties": {
+ "minCountInstances": 1,
+ "maxCountInstances": 1,
+ "initialCount": 1,
+ "vfModuleLabel": "PASQUALE_base_vPE_BV",
+ "baseModule" : true
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ }
+ },
+ "volumeGroups": {
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": {
+ "uuid": "13bea14d-9405-43c6-920b-97bab64b6a01",
+ "invariantUuid": "83dc51de-a337-498e-9fee-763603a057b4",
+ "customizationUuid": "a90865d5-6de0-4ef8-bf53-d45fa3edddfc",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "properties": {
+ "minCountInstances": null,
+ "maxCountInstances": null,
+ "initialCount": null,
+ "vfModuleLabel": "PASQUALE_vPFE_BV",
+ "baseModule" : false
+ },
+ "inputs": {}
+ },
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": {
+ "uuid": "3f6d5e51-a9a0-4c53-bb6d-be836767d96f",
+ "invariantUuid": "54466b6d-e33c-4f4d-87e2-32bc5b103589",
+ "customizationUuid": "dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "PASQUALE_vRE_BV",
+ "baseModule" : false
+ },
+ "inputs": {}
+ }
+ },
+ "vfcInstanceGroups": {}
+ }
+ },
+ "networks": {},
+ "collectionResource": {},
+ "configurations": {},
+ "fabricConfigurations": {},
+ "serviceProxies": {},
+ "vfModules": {
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": {
+ "uuid": "13bea14d-9405-43c6-920b-97bab64b6a01",
+ "invariantUuid": "83dc51de-a337-498e-9fee-763603a057b4",
+ "customizationUuid": "a90865d5-6de0-4ef8-bf53-d45fa3edddfc",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "properties": {
+ "minCountInstances": null,
+ "maxCountInstances": null,
+ "initialCount": null,
+ "vfModuleLabel": "PASQUALE_vPFE_BV",
+ "baseModule" : false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": true
+ },
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0": {
+ "uuid": "0a45a870-3a19-4238-a72a-eadfc583d4fe",
+ "invariantUuid": "c636b302-fba2-4ed7-9f3b-c99715b6bb2e",
+ "customizationUuid": "a0b634e6-514e-4977-91dd-3b8c295e6bc8",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0",
+ "properties": {
+ "minCountInstances": 1,
+ "maxCountInstances": 1,
+ "initialCount": 1,
+ "vfModuleLabel": "PASQUALE_base_vPE_BV",
+ "baseModule" : true
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ },
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": {
+ "uuid": "3f6d5e51-a9a0-4c53-bb6d-be836767d96f",
+ "invariantUuid": "54466b6d-e33c-4f4d-87e2-32bc5b103589",
+ "customizationUuid": "dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "PASQUALE_vRE_BV",
+ "baseModule" : false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": true
+ }
+ },
+ "volumeGroups": {
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": {
+ "uuid": "13bea14d-9405-43c6-920b-97bab64b6a01",
+ "invariantUuid": "83dc51de-a337-498e-9fee-763603a057b4",
+ "customizationUuid": "a90865d5-6de0-4ef8-bf53-d45fa3edddfc",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "properties": {
+ "minCountInstances": null,
+ "maxCountInstances": null,
+ "initialCount": null,
+ "vfModuleLabel": "PASQUALE_vPFE_BV",
+ "baseModule" : false
+ },
+ "inputs": {}
+ },
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": {
+ "uuid": "3f6d5e51-a9a0-4c53-bb6d-be836767d96f",
+ "invariantUuid": "54466b6d-e33c-4f4d-87e2-32bc5b103589",
+ "customizationUuid": "dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "PASQUALE_vRE_BV",
+ "baseModule" : false
+ },
+ "inputs": {}
+ }
+ },
+ "pnfs": {},
+ "vnfGroups": {}
+}