diff options
| author |   Einat Vinouze <einat.vinouze@intl.att.com> | 2019-07-16 17:17:36 +0300 |
|---|---|---|
| committer |   Ittay Stern <ittay.stern@att.com> | 2019-07-30 06:01:44 +0300 |
| commit | e601bbdc43bae9a08e2e10c5139a6f76b47860d7 (patch) | |
| tree | 1913f0b369ead3f2ea5557e5649d8281eca9871c /vid-app-common/src/test/resources/payload_jsons | |
| parent | 76c6ee4a697617ec4cdee2f3b48bc83136c858c5 (diff) | |
Implant vid-app-common org.onap.vid.job (main and test)
Issue-ID: VID-378
Change-Id: I41b0bdc2c4e3635f3f3319b1cd63cefc61912dfc
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-app-common/src/test/resources/payload_jsons')
36 files changed, 1760 insertions, 30 deletions
diff --git a/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate1Delete1None1Request.json b/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate1Delete1None1Request.json new file mode 100644 index 000000000..bc645452f --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate1Delete1None1Request.json @@ -0,0 +1,123 @@ +{ + "action": "None", + "isDirty": true, + "trackById":"aabbcc", + "vnfs": {}, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "service_instance_name": "", + "vnf_group3_instance_name": "" + }, + "existingVNFCounterMap": {}, + "existingVnfGroupCounterMap": { + "daeb6568-cef8-417f-9075-ed259ce59f48": 3 + }, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": { + "groupingservicefortest..ResourceInstanceGroup..0:001": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "groupingservicefortest..ResourceInstanceGroup..0:001", + "instanceName": "VNF_GROUP1_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None_Delete", + "instanceId": "VNF_GROUP1_INSTANCE_ID", + "instanceType": "VNF_GROUP1_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "tenantId": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs":{} + }, + "groupingservicefortest..ResourceInstanceGroup..0:002": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "groupingservicefortest..ResourceInstanceGroup..0:002", + "instanceName": "VNF_GROUP2_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None", + "instanceId": "VNF_GROUP2_INSTANCE_ID", + "instanceType": "VNF_GROUP2_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "tenantId": null, + "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs": {} + }, + "groupingservicefortest..ResourceInstanceGroup..0": { + "action": "Create", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "ag5aav86u4j", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP3_INSTANCE_NAME", + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ], + "vnfs":{} + } + }, + "bulkSize": 1, + "instanceName": "SERVICE_INSTANCE_NAME", + + "instanceId": "service-instance-id", + "orchStatus": "GARBAGE DATA", + "globalSubscriberId": "global-customer-id", + "subscriptionServiceType": "service-instance-type", + "owningEntityId": null, + "owningEntityName": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "tenantName": null, + "aicZoneId": null, + "aicZoneName": null, + "projectName": null, + "rollbackOnFailure": false, + "isALaCarte": true, + "modelInfo": { + "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelName": "Grouping Service for Test", + "modelType": "service", + "modelVersion": "1.0" + }, + + "testApi": "VNF_API" +} diff --git a/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate3Delete1None1Request.json b/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate3Delete1None1Request.json new file mode 100644 index 000000000..1906bc89f --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate3Delete1None1Request.json @@ -0,0 +1,171 @@ +{ + "action": "None", + "isDirty": true, + "trackById":"aabbcc", + "vnfs": {}, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "service_instance_name": "", + "vnf_group3_instance_name": "" + }, + "existingVNFCounterMap": {}, + "existingVnfGroupCounterMap": { + "daeb6568-cef8-417f-9075-ed259ce59f48": 3 + }, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": { + "groupingservicefortest..ResourceInstanceGroup..0:001": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "groupingservicefortest..ResourceInstanceGroup..0:001", + "instanceName": "VNF_GROUP1_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None_Delete", + "instanceId": "VNF_GROUP1_INSTANCE_ID", + "instanceType": "VNF_GROUP1_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "tenantId": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs":{} + }, + "groupingservicefortest..ResourceInstanceGroup..0:002": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "groupingservicefortest..ResourceInstanceGroup..0:002", + "instanceName": "VNF_GROUP2_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None", + "instanceId": "VNF_GROUP2_INSTANCE_ID", + "instanceType": "VNF_GROUP2_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "tenantId": null, + "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs": {} + }, + "groupingservicefortest..ResourceInstanceGroup..0": { + "action": "Create", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "ag5aav86u4j", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP3_INSTANCE_NAME", + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ], + "vnfs":{} + }, + "groupingservicefortest..ResourceInstanceGroup..0:003": { + "action": "Create", + "isFailed": true, + "statusMessage": "failed!", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "asedrftjko", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP4_INSTANCE_NAME", + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ], + "vnfs":{} + }, + "groupingservicefortest..ResourceInstanceGroup..0:004": { + "action": "Create", + "isFailed": false, + "statusMessage": null, + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "rgedfdged4", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP5_INSTANCE_NAME", + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ], + "vnfs":{} + } + }, + "bulkSize": 1, + "instanceName": "SERVICE_INSTANCE_NAME", + + "instanceId": "service-instance-id", + "orchStatus": "GARBAGE DATA", + "globalSubscriberId": "global-customer-id", + "subscriptionServiceType": "service-instance-type", + "owningEntityId": null, + "owningEntityName": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "tenantName": null, + "aicZoneId": null, + "aicZoneName": null, + "projectName": null, + "rollbackOnFailure": false, + "isALaCarte": true, + "modelInfo": { + "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelName": "Grouping Service for Test", + "modelType": "service", + "modelVersion": "1.0" + }, + + "testApi": "VNF_API" +} diff --git a/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate3Delete1None1RequestResolvedForRetry.json b/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate3Delete1None1RequestResolvedForRetry.json new file mode 100644 index 000000000..6196cd797 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate3Delete1None1RequestResolvedForRetry.json @@ -0,0 +1,176 @@ +{ + "action": "None", + "isDirty": true, + "trackById":"aabbcc", + "vnfs": {}, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "service_instance_name": "", + "vnf_group3_instance_name": "" + }, + "existingVNFCounterMap": {}, + "existingVnfGroupCounterMap": { + "daeb6568-cef8-417f-9075-ed259ce59f48": 3 + }, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": { + "groupingservicefortest..ResourceInstanceGroup..0:001": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "groupingservicefortest..ResourceInstanceGroup..0:001", + "instanceName": "VNF_GROUP1_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None", + "statusMessage": "Vnf has been created successfully.", + "instanceId": "VNF_GROUP1_INSTANCE_ID", + "instanceType": "VNF_GROUP1_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "tenantId": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs":{} + }, + "groupingservicefortest..ResourceInstanceGroup..0:002": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "groupingservicefortest..ResourceInstanceGroup..0:002", + "instanceName": "VNF_GROUP2_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None", + "instanceId": "VNF_GROUP2_INSTANCE_ID", + "instanceType": "VNF_GROUP2_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "tenantId": null, + "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs": {} + }, + "groupingservicefortest..ResourceInstanceGroup..0": { + "action": "Create", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "ag5aav86u4j", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP3_INSTANCE_NAME", + "isFailed": true, + "statusMessage": "Vnf has been created successfully.", + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ], + "vnfs":{} + }, + "groupingservicefortest..ResourceInstanceGroup..0:003": { + "action": "None", + "isFailed": false, + "instanceId": "VNF_GROUP1_INSTANCE_ID_3", + "statusMessage": "Vnf has been created successfully.", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "asedrftjko", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP4_INSTANCE_NAME", + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ], + "vnfs":{} + }, + "groupingservicefortest..ResourceInstanceGroup..0:004": { + "action": "None", + "isFailed": false, + "statusMessage": "Vnf has been created successfully.", + "instanceId": "VNF_GROUP1_INSTANCE_ID_4", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "rgedfdged4", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP5_INSTANCE_NAME", + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ], + "vnfs":{} + } + }, + "bulkSize": 1, + "instanceName": "SERVICE_INSTANCE_NAME", + + "instanceId": "service-instance-id", + "orchStatus": "GARBAGE DATA", + "globalSubscriberId": "global-customer-id", + "subscriptionServiceType": "service-instance-type", + "owningEntityId": null, + "owningEntityName": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "tenantName": null, + "aicZoneId": null, + "aicZoneName": null, + "projectName": null, + "rollbackOnFailure": false, + "isALaCarte": true, + "modelInfo": { + "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelName": "Grouping Service for Test", + "modelType": "service", + "modelVersion": "1.0" + }, + + "testApi": "VNF_API" +} diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request.json b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request.json index 955685268..4e3fc1021 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request.json @@ -9,7 +9,7 @@ }, "owningEntity": { "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName": "PACKET CORE" + "owningEntityName": "JULIO ERICKSON" }, "project": { "projectName": "{some project name}" diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request_naming_false.json b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request_naming_false.json index be697ed88..5b1fdc1bd 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request_naming_false.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request_naming_false.json @@ -9,7 +9,7 @@ }, "owningEntity": { "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName": "PACKET CORE" + "owningEntityName": "JULIO ERICKSON" }, "subscriberInfo": { "globalSubscriberId": "{some subscriber id}" diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_macro_service_request.json b/vid-app-common/src/test/resources/payload_jsons/bulk_macro_service_request.json index 917900c22..c0315d015 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_macro_service_request.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_macro_service_request.json @@ -9,7 +9,7 @@ }, "owningEntity": { "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName": "PACKET CORE" + "owningEntityName": "JULIO ERICKSON" }, "project": { "projectName": "{some project name}" @@ -51,7 +51,7 @@ }, "cloudConfiguration": { "lcpCloudRegionId": "mdt1", - "cloudOwner": "att-aic", + "cloudOwner": "irma-aic", "tenantId": "88a6ca3ee0394ade9403f075db23167e" }, "platform": { diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json index 55765a86b..dd343f46e 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json @@ -9,7 +9,7 @@ }, "owningEntity": { "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName": "PACKET CORE" + "owningEntityName": "JULIO ERICKSON" }, "project": { "projectName": "{some project name}" @@ -48,7 +48,7 @@ }, "cloudConfiguration": { "lcpCloudRegionId": "mdt1", - "cloudOwner": "att-aic", + "cloudOwner": "irma-aic", "tenantId": "88a6ca3ee0394ade9403f075db23167e" }, "platform": { diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json index fdc81511c..0ef15d790 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json @@ -9,7 +9,7 @@ }, "owningEntity": { "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName": "PACKET CORE" + "owningEntityName": "JULIO ERICKSON" }, "project": { "projectName": "{some project name}" @@ -48,7 +48,7 @@ }, "cloudConfiguration": { "lcpCloudRegionId": "mdt1", - "cloudOwner": "att-aic", + "cloudOwner": "irma-aic", "tenantId": "88a6ca3ee0394ade9403f075db23167e" }, "platform": { diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json index 643c1043a..c4f40a9c0 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json @@ -9,7 +9,7 @@ }, "owningEntity": { "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName": "PACKET CORE" + "owningEntityName": "JULIO ERICKSON" }, "project": { "projectName": "{some project name}" @@ -50,7 +50,7 @@ }, "cloudConfiguration": { "lcpCloudRegionId": "mdt1", - "cloudOwner": "att-aic", + "cloudOwner": "irma-aic", "tenantId": "88a6ca3ee0394ade9403f075db23167e" }, "platform": { diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request.json b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request.json index d7b6d8629..5aa0211d1 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request.json @@ -12,7 +12,7 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner" : "att-aic" + "cloudOwner" : "irma-aic" }, "requestInfo": { "instanceName": "vmxnjr001_001", diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_instance_name.json b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_instance_name.json index 9921de59b..7322d8589 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_instance_name.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_instance_name.json @@ -12,7 +12,7 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner": "att-aic" + "cloudOwner": "irma-aic" }, "requestInfo": { "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", diff --git a/vid-app-common/src/test/resources/payload_jsons/instance_group_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/instance_group_instantiation_request.json index 7072d3213..70e8f04ff 100644 --- a/vid-app-common/src/test/resources/payload_jsons/instance_group_instantiation_request.json +++ b/vid-app-common/src/test/resources/payload_jsons/instance_group_instantiation_request.json @@ -10,7 +10,7 @@ "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" }, "requestInfo": { - "instanceName": "VNF_GROUP_NAME_001", + "instanceName": "VNF_GROUP_NAME", "source": "VID", "suppressRollback": true, "requestorId": "az2018" @@ -30,7 +30,8 @@ } ], "requestParameters": { - "userParams": [] + "userParams": [], + "testApi" : "VNF_API" } } }
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/mso_request_create_configuration.json b/vid-app-common/src/test/resources/payload_jsons/mso_request_create_configuration.json index e0942bae2..c4849f047 100644 --- a/vid-app-common/src/test/resources/payload_jsons/mso_request_create_configuration.json +++ b/vid-app-common/src/test/resources/payload_jsons/mso_request_create_configuration.json @@ -39,7 +39,7 @@ "modelType": "vnf", "modelInvariantId": "a7eac2b3-8444-40ee-92e3-b3359b32445c", "modelVersionId": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6", - "modelName": "vmmeService2", + "modelName": "vflorenceService2", "modelVersion": "1.0", "modelCustomizationId": "060be63d-5f9c-4fd0-8ef7-830d5e8eca17" } diff --git a/vid-app-common/src/test/resources/payload_jsons/mso_service_instantiation.json b/vid-app-common/src/test/resources/payload_jsons/mso_service_instantiation.json index 537b8d60c..926c435dc 100644 --- a/vid-app-common/src/test/resources/payload_jsons/mso_service_instantiation.json +++ b/vid-app-common/src/test/resources/payload_jsons/mso_service_instantiation.json @@ -13,7 +13,7 @@ }, "owningEntity": { "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName": "PACKET CORE" + "owningEntityName": "JULIO ERICKSON" }, "project": { "projectName": "TODO" @@ -49,7 +49,7 @@ "modelVersion":"10.0" }, "owningEntityId":"038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName":"PACKET CORE", + "owningEntityName":"JULIO ERICKSON", "projectName":"{some project name}", "globalSubscriberId":"{some subscriber id}", "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", diff --git a/vid-app-common/src/test/resources/payload_jsons/networkDelete1Create1Request.json b/vid-app-common/src/test/resources/payload_jsons/networkDelete1Create1Request.json new file mode 100644 index 000000000..cc35dcac7 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/networkDelete1Create1Request.json @@ -0,0 +1,117 @@ +{ + "action":"None", + "isDirty":true, + "vnfs":{ + + }, + "instanceParams":[ + { + "2017488_pasqualevpe0_ASN":"AV_vPE" + } + ], + "validationCounter":0, + "existingNames":{ + "123":"", + "instancename":"", + "yoav":"" + }, + "existingVNFCounterMap":{ + + }, + "existingVnfGroupCounterMap":{ + + }, + "existingNetworksCounterMap":{ + "94fdd893-4a36-4d70-b16a-ec29c54c184f":1 + }, + "networks":{ + "ExtVL 0":{ + "rollbackOnFailure":"false", + "productFamilyId":"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", + "lcpCloudRegionId":"hvf6", + "tenantId":"229bcdc6eaeb4ca59d55221141d01f8e", + "lineOfBusiness":"zzz1", + "platformName":"platform", + "originalName":"ExtVL 0", + "modelInfo":{ + "modelInvariantId":"379f816b-a7aa-422f-be30-17114ff50b7c", + "modelVersionId":"ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelName":"ExtVL", + "modelVersion":"37.0", + "modelType":"network", + "modelCustomizationId":"94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelCustomizationName":"ExtVL 0" + }, + "instanceName":"ExtVL 0", + "instanceId":"NETWORK_INSTANCE_ID", + "action":"None_Delete" + }, + "ExtVL 0_1":{ + "action":"Create", + "inMaint":false, + "rollbackOnFailure":"true", + "originalName":"ExtVL 0", + "isMissingData":false, + "trackById":"r21vcx0szoc", + "networkStoreKey":"ExtVL 0_1", + "instanceName":"ExtVL", + "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "lcpCloudRegionId":"hvf6", + "tenantId":"229bcdc6eaeb4ca59d55221141d01f8e", + "platformName":"xxx1", + "lineOfBusiness":"zzz1", + "instanceParams":[ + { + + } + ], + "modelInfo":{ + "modelInvariantId":"379f816b-a7aa-422f-be30-17114ff50b7c", + "modelVersionId":"ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelName":"ExtVL", + "modelVersion":"37.0", + "modelCustomizationId":"94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelCustomizationName":"ExtVL 0", + "uuid":"ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelUniqueId":"94fdd893-4a36-4d70-b16a-ec29c54c184f" + }, + "uuid":"ddc3f20c-08b5-40fd-af72-c6d14636b986" + } + }, + "vnfGroups":{ + + }, + "bulkSize":1, + "instanceName":"InstanceName", + "globalSubscriberId":"e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType":"TYLER SILVIA", + "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId":"17cc1042-527b-11e6-beb8-9e71128cae77", + "lcpCloudRegionId":"AAIAIC25", + "tenantId":"092eb9e8e4b7412e8787dd091bc58e86", + "aicZoneId":"JAG1", + "projectName":"WATKINS", + "rollbackOnFailure":true, + "aicZoneName":"YUDFJULP-JAG1", + "owningEntityName":"WayneHolland", + "testApi":"GR_API", + "tenantName":"USP-SIP-IC-24335-T-01", + "modelInfo":{ + "modelInvariantId":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId":"6b528779-44a3-4472-bdff-9cd15ec93450", + "modelName":"action-data", + "modelVersion":"1.0", + "uuid":"6b528779-44a3-4472-bdff-9cd15ec93450" + }, + "isALaCarte":true, + "name":"action-data", + "version":"1.0", + "description":"", + "category":"", + "uuid":"6b528779-44a3-4472-bdff-9cd15ec93450", + "invariantUuid":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "serviceType":"", + "serviceRole":"", + "isMultiStepDesign":false, + "instanceId":"f8791436-8d55-4fde-b4d5-72dd2cf13cfb" +}
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request.json index 5a722ac4c..241ee07a9 100644 --- a/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request.json +++ b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request.json @@ -12,10 +12,10 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner" : "att-aic" + "cloudOwner" : "irma-aic" }, "requestInfo": { - "instanceName": "vmxnjr001_001", + "instanceName": "vmxnjr001", "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "source": "VID", "suppressRollback": true, @@ -42,7 +42,8 @@ } ], "requestParameters": { - "userParams": [] + "userParams": [], + "testApi" : "VNF_API" } } }
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request_without_instance_name.json b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request_without_instance_name.json index db55736c4..8b69e0beb 100644 --- a/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request_without_instance_name.json +++ b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request_without_instance_name.json @@ -12,7 +12,7 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner" : "att-aic" + "cloudOwner" : "irma-aic" }, "requestInfo": { "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", @@ -41,7 +41,8 @@ } ], "requestParameters": { - "userParams": [] + "userParams": [], + "testApi" : "VNF_API" } } }
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/pre_1806_macro_service_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/pre_1806_macro_service_instantiation_request.json new file mode 100644 index 000000000..992323023 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/pre_1806_macro_service_instantiation_request.json @@ -0,0 +1,47 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "sriov", + "modelVersion": "1.0" + }, + "cloudConfiguration": { + "cloudOwner": "irma-aic", + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "JULIO ERICKSON" + }, + "project": { + "projectName": "some_project_name" + }, + "subscriberInfo": { + "globalSubscriberId": "some_subscriber_id", + "subscriberName": "some_subscriber_name" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "az2016" + }, + "requestParameters": { + "subscriptionServiceType": "MOG", + "aLaCarte": false, + "userParams": [ + { + "name": "someUserParam", + "value": "someValue" + }, + { + "name": "anotherUserParam", + "value": "anotherValue" + } + ] + } + } +}
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/pre_1806_macro_without_cloudConfiguration.json b/vid-app-common/src/test/resources/payload_jsons/pre_1806_macro_without_cloudConfiguration.json new file mode 100644 index 000000000..472ccc90e --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/pre_1806_macro_without_cloudConfiguration.json @@ -0,0 +1,42 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "sriov", + "modelVersion": "1.0" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "JULIO ERICKSON" + }, + "project": { + "projectName": "some_project_name" + }, + "subscriberInfo": { + "globalSubscriberId": "some_subscriber_id", + "subscriberName": "some_subscriber_name" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "az2016" + }, + "requestParameters": { + "subscriptionServiceType": "MOG", + "aLaCarte": false, + "userParams": [ + { + "name": "someUserParam", + "value": "someValue" + }, + { + "name": "anotherUserParam", + "value": "anotherValue" + } + ] + } + } +}
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/resume/feRequestResumeMacroService.json b/vid-app-common/src/test/resources/payload_jsons/resume/feRequestResumeMacroService.json new file mode 100644 index 000000000..c2c84dc9c --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/resume/feRequestResumeMacroService.json @@ -0,0 +1,107 @@ +{ + "isDirty": false, + "instanceParams": [], + "existingNames": { + "ncmvlansvcym161f_77": "" + }, + "vidNotions": { + "instantiationType": "Macro", + "instantiationUI": "serviceWithCollectionResource", + "modelCategory": "other", + "viewEditUI": "serviceWithCollectionResource" + }, + "bulkSize": 1, + "action": "Resume", + "instanceName": "NcmVlanSvcYm161f_77", + "instanceId": "a565e6ad-75d1-4493-98f1-33234b5c17e2", + "orchStatus": "Assigned", + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "cloudOwner": null, + "modelInfo": { + "modelInvariantId": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea", + "modelVersionId": "6e0bec91-09f3-43aa-9cf3-e617cd0146be", + "modelName": "NCM_VLAN_SVC_ym161f", + "modelType": "service", + "modelVersion": "8.0" + }, + "globalSubscriberId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "subscriptionServiceType": "Emanuel", + "owningEntityId": null, + "owningEntityName": null, + "tenantName": null, + "aicZoneId": null, + "aicZoneName": null, + "projectName": null, + "rollbackOnFailure": false, + "isALaCarte": false, + "vnfs": {}, + "vrfs": {}, + "networks": {}, + "vnfGroups": {}, + "validationCounter": 0, + "existingVNFCounterMap": {}, + "existingVRFCounterMap": {}, + "existingNetworksCounterMap": {}, + "existingVnfGroupCounterMap": {}, + "collectionResources": { + "84a351ae-3601-45e2-98df-878d6c816abc": { + "action": "None", + "instanceName": "NcmVlanSvcYm161f_77_vTSBC Customer Landing Network Collection", + "instanceId": "84a351ae-3601-45e2-98df-878d6c816abc", + "orchStatus": "Active", + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "cloudOwner": null, + "modelInfo": { + "modelInvariantId": "081ceb56-eb71-4566-a72d-3e7cbee5cdf1", + "modelVersionId": "ce8c98bc-4691-44fb-8ff0-7a47487c11c4", + "modelName": "NCM_VLAN_ym161f", + "modelType": "collection", + "modelVersion": "5.0" + }, + "instanceType": null, + "provStatus": null, + "inMaint": false, + "uuid": "ce8c98bc-4691-44fb-8ff0-7a47487c11c4", + "originalName": "NCM_VLAN_ym161f 0", + "legacyRegion": null, + "lineOfBusiness": null, + "platformName": null, + "trackById": "84a351ae-3601-45e2-98df-878d6c816abc", + "ncfs": { + "6b3536cf-3a12-457f-abb5-fa2203e0d923": { + "action": "None", + "instanceName": "NcmVlanSvcYm161f_77_vTSBC Customer Landing Network Collection", + "instanceId": "6b3536cf-3a12-457f-abb5-fa2203e0d923", + "orchStatus": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "cloudOwner": null, + "modelInfo": { + "modelInvariantId": "868b109c-9481-4a18-891b-af974db7705a", + "modelVersionId": "dd182d7d-6949-4b90-b3cc-5befe400742e", + "modelName": "ncm_vlan_ym161f..NetworkCollection..0", + "modelType": "instanceGroup", + "modelVersion": "1" + }, + "instanceType": "L3-NETWORK", + "provStatus": null, + "inMaint": false, + "uuid": "dd182d7d-6949-4b90-b3cc-5befe400742e", + "originalName": "ncm_vlan_ym161f..NetworkCollection..0", + "legacyRegion": null, + "lineOfBusiness": null, + "platformName": null, + "trackById": "6b3536cf-3a12-457f-abb5-fa2203e0d923", + "instanceGroupRole": "SUB_INTERFACE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "numberOfNetworks": 1 + } + } + } + } +} diff --git a/vid-app-common/src/test/resources/payload_jsons/resume/msoResponseGetRequestsOfServiceInstance.json b/vid-app-common/src/test/resources/payload_jsons/resume/msoResponseGetRequestsOfServiceInstance.json new file mode 100644 index 000000000..cb49dd8da --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/resume/msoResponseGetRequestsOfServiceInstance.json @@ -0,0 +1,62 @@ +{ + "requestList": [ + { + "request": { + "requestId": "894089b8-f7f4-418d-81da-34186fd32670", + "startTime": "Wed, 10 Oct 2018 08:01:21 GMT", + "finishTime": "Wed, 10 Oct 2018 08:01:43 GMT", + "requestScope": "service", + "requestType": "createInstance", + "requestDetails": { + "modelInfo": { + "modelInvariantId": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea", + "modelType": "service", + "modelName": "NCM_VLAN_SVC_ym161f", + "modelVersion": "8.0", + "modelVersionId": "6e0bec91-09f3-43aa-9cf3-e617cd0146be", + "modelUuid": "6e0bec91-09f3-43aa-9cf3-e617cd0146be", + "modelInvariantUuid": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea" + }, + "requestInfo": { + "productFamilyId": "db171b8f-115c-4992-a2e3-ee04cae357e0", + "source": "VID", + "suppressRollback": false, + "requestorId": "cs0554" + }, + "subscriberInfo": { + "globalSubscriberId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" + }, + "cloudConfiguration": { + "tenantId": "d3b49834f7164cbe831bfbfa35ef649b", + "cloudOwner": "irma-aic", + "lcpCloudRegionId": "Two" + }, + "requestParameters": { + "subscriptionServiceType": "Emanuel", + "userParams": [ + { + "name": "aic_zone", + "value": "TTL58" + } + ], + "aLaCarte": false + }, + "owningEntity": { + "owningEntityId": "e4257a94-21cc-40c5-adc9-e6f4ff868e31", + "owningEntityName": "EMANUEL-CORE" + } + }, + "instanceReferences": { + "serviceInstanceId": "a565e6ad-75d1-4493-98f1-33234b5c17e2", + "requestorId": "cs0554" + }, + "requestStatus": { + "requestState": "FAILED", + "statusMessage": "STATUS: Macro-Service-createInstance request was executed correctly.", + "percentProgress": 100, + "timestamp": "Wed, 10 Oct 2018 08:01:43 GMT" + } + } + } + ] +} diff --git a/vid-app-common/src/test/resources/payload_jsons/vfModuleDelete1Create1None1Request.json b/vid-app-common/src/test/resources/payload_jsons/vfModuleDelete1Create1None1Request.json new file mode 100644 index 000000000..642c2aac9 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vfModuleDelete1Create1None1Request.json @@ -0,0 +1,139 @@ +{ + "action": "None", + "isDirty": true, + "vnfs": { + "2017-488_PASQUALE-vPE 0": { + "vfModules": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "instanceName": "VFinstancenameZERO", + "instanceId": "VF_MODULE_INSTANCE_ID", + "action": "Create", + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "modelInfo": { + "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", + "modelVersion": "5", + "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + }, + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "provStatus": "Prov Status", + "orchStatus": "Active", + "inMaint": true + } + }, + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": { + "instanceName": "VFinstancename", + "instanceId": "VF_MODULE_INSTANCE_ID", + "action": "None_Delete", + "volumeGroupName": "VFinstancename_vol_abc", + "orchStatus": "Create", + "provStatus": "Prov Status", + "inMaint": false, + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + } + }, + "2017588_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-2": { + "2017588_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-2frgth": { + "instanceName": "VFinstancename", + "instanceId": "VF_MODULE_INSTANCE_ID1", + "action": "None", + "volumeGroupName": "VFinstancename_vol_abc", + "orchStatus": "Create", + "provStatus": "Prov Status", + "inMaint": false, + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + } + } + }, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "orchStatus": "Created", + "inMaint": false, + "instanceId": "VNF_INSTANCE_ID", + "instanceName": "2017488_PASQUALEvPEVNFinstancename", + "action": "None", + "legacyRegion": "some legacy region" + } + }, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "mcankinstancename": "" + }, + "existingVNFCounterMap": { + "afacccf6-397d-45d6-b5ae-94c39734b168": 1, + "69e09f68-8b63-4cc9-b9ff-860960b5db09": 3, + "b3c76f73-eeb5-4fb6-9d31-72a889f1811c": 1 + }, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": {}, + "bulkSize": 1, + "instanceId": "f8791436-8d55-4fde-b4d5-72dd2cf13cfb", + "instanceName": "mCaNkinstancename", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType": "TYLER SILVIA", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "hvf6", + "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", + "aicZoneId": "NFT1", + "projectName": "WATKINS", + "rollbackOnFailure": true, + "aicZoneName": "NFTJSSSS-NFT1", + "owningEntityName": "WayneHolland", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "modelInfo": { + "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId": "6b528779-44a3-4472-bdff-9cd15ec93450", + "modelName": "action-data", + "modelVersion": "1.0", + "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450" + }, + "isALaCarte": true, + "orchStatus": "Active", + "modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450", + "testApi": "VNF_API" +}
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule.json new file mode 100644 index 000000000..c3ab694aa --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule.json @@ -0,0 +1,52 @@ +{ + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "az2016", + "instanceName": "replace_module", + "suppressRollback": false + }, + "relatedInstanceList": [{ + "relatedInstance": { + "instanceId": "e9993045-cc96-4f3f-bf9a-71b2a400a956", + "modelInfo": { + "modelVersionId": "bad955c3-29b2-4a27-932e-28e942cc6480", + "modelVersion": "1", + "modelName": "Vf zolson5bpxmc02092017-Service", + "modelInvariantId": "b16a9398-ffa3-4041-b78c-2956b8ad9c7b", + "modelType": "service" + } + } + }, { + "relatedInstance": { + "instanceId": "5c9c2896-1fe6-4055-b7ec-d0a01e5f9bf5", + "modelInfo": { + "modelName": "Vf zolson5bpxmc02092017-VF", + "modelVersion": "1", + "modelInvariantId": "23122c9b-dd7f-483f-bf0a-e069303db2f7", + "modelType": "vnf", + "modelCustomizationName": "Vf zolson5bpxmc02092017-VF 0", + "modelVersionId": "d326f424-2312-4dd6-b7fe-364fadbd1ef5", + "modelCustomizationId": "96c23a4a-6887-4b2c-9cce-1e4ea35eaade" + } + } + }], + "requestParameters": { + "userParams": [], + "testApi": "GR_API" + }, + "modelInfo": { + "modelName": "VfZrdm5bpxmc02092017Vf..CORNELIUS_base..module-0", + "modelVersion": "1", + "modelInvariantId": "f7a867f2-596b-4f4a-a128-421e825a6190", + "modelType": "vfModule", + "modelVersionId": "eb5de6fb-9ecf-4009-b922-fae3a9ae7d46", + "modelCustomizationId": "074c64d0-7e13-4bcc-8bdb-ea922331102d" + }, + "cloudConfiguration": { + "cloudOwner": "irma-aic", + "tenantId": "0422ffb57ba042c0800a29dc85ca70f8", + "lcpCloudRegionId": "regionOne" + } + } +}
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule_fe_input.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule_fe_input.json new file mode 100644 index 000000000..92ccfe541 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule_fe_input.json @@ -0,0 +1,92 @@ +{ + "action": "None", + "isDirty": true, + "vnfs": { + "Vf zolson5bpxmc02092017-VF 0": { + "vfModules": { + "VfZrdm5bpxmc02092017Vf..CORNELIUS_base..module-0": { + "VfZrdm5bpxmc02092017Vf..CORNELIUS_base..module-0-?": { + "instanceName": "replace_module", + "instanceId": "5d49c3b1-fc90-4762-8c98-e800170baa55", + "action": "Replace", + "orchStatus": "Create", + "provStatus": "Prov Status", + "inMaint": false, + "rollbackOnFailure": true, + "lcpCloudRegionId": "regionOne", + "tenantId": "0422ffb57ba042c0800a29dc85ca70f8", + "modelInfo": { + "modelInvariantId": "f7a867f2-596b-4f4a-a128-421e825a6190", + "modelVersionId": "eb5de6fb-9ecf-4009-b922-fae3a9ae7d46", + "modelName": "VfZrdm5bpxmc02092017Vf..CORNELIUS_base..module-0", + "modelVersion": "1", + "modelCustomizationId": "074c64d0-7e13-4bcc-8bdb-ea922331102d", + "uuid": "eb5de6fb-9ecf-4009-b922-fae3a9ae7d46" + }, + "uuid": "eb5de6fb-9ecf-4009-b922-fae3a9ae7d46" + } + } + }, + "uuid": "d326f424-2312-4dd6-b7fe-364fadbd1ef5", + "productFamilyId": "bad955c3-29b2-4a27-932e-28e942cc6480", + "lcpCloudRegionId": "regionOne", + "tenantId": "0422ffb57ba042c0800a29dc85ca70f8", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "23122c9b-dd7f-483f-bf0a-e069303db2f7", + "modelVersionId": "d326f424-2312-4dd6-b7fe-364fadbd1ef5", + "modelName": "Vf zolson5bpxmc02092017-VF", + "modelVersion": "1", + "modelCustomizationId": "96c23a4a-6887-4b2c-9cce-1e4ea35eaade", + "modelCustomizationName": "Vf zolson5bpxmc02092017-VF 0", + "uuid": "d326f424-2312-4dd6-b7fe-364fadbd1ef5" + }, + "orchStatus": "Created", + "inMaint": false, + "rollbackOnFailure": true, + "instanceId": "5c9c2896-1fe6-4055-b7ec-d0a01e5f9bf5", + "instanceName": "vnf_of_replace_module", + "action": "None", + "legacyRegion": "some legacy region" + } + }, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "mcankinstancename": "" + }, + "existingVNFCounterMap": { + "d326f424-2312-4dd6-b7fe-364fadbd1ef5": 1 + }, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": {}, + "bulkSize": 1, + "instanceId": "e9993045-cc96-4f3f-bf9a-71b2a400a956", + "instanceName": "service_of_replace_module", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType": "TYLER SILVIA", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId": "bad955c3-29b2-4a27-932e-28e942cc6480", + "lcpCloudRegionId": "regionOne", + "tenantId": "0422ffb57ba042c0800a29dc85ca70f8", + "aicZoneId": "NFT1", + "projectName": "WATKINS", + "rollbackOnFailure": true, + "aicZoneName": "NFTJSSSS-NFT1", + "owningEntityName": "WayneHolland", + "tenantName": "tenant_name", + "modelInfo": { + "modelInvariantId": "b16a9398-ffa3-4041-b78c-2956b8ad9c7b", + "modelVersionId": "bad955c3-29b2-4a27-932e-28e942cc6480", + "modelName": "Vf zolson5bpxmc02092017-Service", + "modelVersion": "1", + "uuid": "bad955c3-29b2-4a27-932e-28e942cc6480" + }, + "isALaCarte": true, + "orchStatus": "Active", + "modelInavariantId": "b16a9398-ffa3-4041-b78c-2956b8ad9c7b", + "testApi": "GR_API" +}
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request.json index 92f837faf..1bce76097 100644 --- a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request.json +++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request.json @@ -12,7 +12,7 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner" : "att-aic" + "cloudOwner" : "irma-aic" }, "requestInfo": { "instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion", @@ -63,7 +63,8 @@ "vre_a_volume_size_0" : "100", "vmx_int_net_len" : "24", "availability_zone_0": "mtpocdv-kvm-az01" - }] + }], + "testApi" : "VNF_API" } } } diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_instance_name.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_instance_name.json index 82df5b90a..1c0d2b981 100644 --- a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_instance_name.json +++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_instance_name.json @@ -12,7 +12,7 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner" : "att-aic" + "cloudOwner" : "irma-aic" }, "requestInfo": { "source": "VID", @@ -53,7 +53,8 @@ "vre_a_volume_size_0" : "100", "vmx_int_net_len" : "24", "availability_zone_0": "mtpocdv-kvm-az01" - }] + }], + "testApi" : "VNF_API" } } }
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_volume_group.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_volume_group.json index cfa4c2652..3581a475a 100644 --- a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_volume_group.json +++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_volume_group.json @@ -12,7 +12,7 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner" : "att-aic" + "cloudOwner" : "irma-aic" }, "requestInfo": { "instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion", @@ -54,7 +54,8 @@ "vre_a_volume_size_0" : "100", "vmx_int_net_len" : "24", "availability_zone_0": "mtpocdv-kvm-az01" - }] + }], + "testApi" : "VNF_API" } } }
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request.json b/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request.json new file mode 100644 index 000000000..1ae0406a7 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request.json @@ -0,0 +1,49 @@ + { + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9", + "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8", + "modelName": "2016-73_MOW-AVPN-vPE-BV-L", + "modelVersion": "10.0", + "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e", + "cloudOwner" : "irma-aic" + }, + "requestInfo": { + "instanceName": "vmxnjr001", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "pa0916" + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lineOfBusinessName" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "sriov", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [], + "testApi" : "VNF_API" + } + } + }
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request_without_cloud_owner.json b/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request_without_cloud_owner.json new file mode 100644 index 000000000..191696490 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request_without_cloud_owner.json @@ -0,0 +1,48 @@ + { + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9", + "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8", + "modelName": "2016-73_MOW-AVPN-vPE-BV-L", + "modelVersion": "10.0", + "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "vmxnjr001", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "pa0916" + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lineOfBusinessName" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "sriov", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [], + "testApi" : "VNF_API" + } + } + }
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request_without_instance_name.json b/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request_without_instance_name.json new file mode 100644 index 000000000..3b59e6d29 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request_without_instance_name.json @@ -0,0 +1,48 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9", + "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8", + "modelName": "2016-73_MOW-AVPN-vPE-BV-L", + "modelVersion": "10.0", + "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e", + "cloudOwner": "irma-aic" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "pa0916" + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lineOfBusinessName" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "sriov", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [], + "testApi" : "VNF_API" + } + } +}
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vnf/vnf_without_lob_expected.json b/vid-app-common/src/test/resources/payload_jsons/vnf/vnf_without_lob_expected.json new file mode 100644 index 000000000..11c5dcb63 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vnf/vnf_without_lob_expected.json @@ -0,0 +1,46 @@ +{ + "requestDetails": { + "modelInfo": { + "modelCustomizationName": "xbi test VID noFC HEAT 0", + "modelCustomizationId": "e9745411-1f7d-47e3-9857-47363cb9ff92", + "modelInvariantId": "77d3a011-affb-4166-89b2-c4be7bc4ff23", + "modelVersionId": "9bb0edd9-3631-455b-bdfd-979b2ab53d07", + "modelName": "xbi test VID noFC HEAT", + "modelType": "vnf", + "modelVersion": "1.0" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "olson52b", + "tenantId": "bbf14e449c954feea272e926a8c2b244", + "cloudOwner" : "irma-aic" + }, + "requestInfo": { + "instanceName": "zolson52bfrwl01", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": false, + "requestorId": "pa0916" + }, + "platform": { + "platformName": "NETWORK-CLOUD" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "sriov", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [], + "testApi": "VNF_API" + } + } +} diff --git a/vid-app-common/src/test/resources/payload_jsons/vnf/vnf_without_lob_user_input.json b/vid-app-common/src/test/resources/payload_jsons/vnf/vnf_without_lob_user_input.json new file mode 100644 index 000000000..60be0d13e --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vnf/vnf_without_lob_user_input.json @@ -0,0 +1,24 @@ +{ + "modelInfo": { + "modelCustomizationName": "xbi test VID noFC HEAT 0", + "modelCustomizationId": "e9745411-1f7d-47e3-9857-47363cb9ff92", + "modelInvariantId": "77d3a011-affb-4166-89b2-c4be7bc4ff23", + "modelVersionId": "9bb0edd9-3631-455b-bdfd-979b2ab53d07", + "modelName": "xbi test VID noFC HEAT", + "modelType": "vnf", + "modelVersion": "1.0" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceName": "zolson52bfrwl01", + "action": "Create", + "platformName": "NETWORK-CLOUD", + "lcpCloudRegionId": "olson52b", + "tenantId": "bbf14e449c954feea272e926a8c2b244", + "instanceParams": [{}], + "rollbackOnFailure": true, + "instanceId": null, + "vfModules": {}, + "trackById": "449206d5-54a6-441f-b5c2-beacb2f2e1cc", + "isFailed": false, + "lineOfBusiness": null +}
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vnfDelete1Create1Request.json b/vid-app-common/src/test/resources/payload_jsons/vnfDelete1Create1Request.json new file mode 100644 index 000000000..5cf7973be --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vnfDelete1Create1Request.json @@ -0,0 +1,240 @@ +{ + "action": "None", + "isDirty": true, + "vnfs": { + "2017-388_PASQUALE-vPE 0": { + "vfModules": {}, + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "afacccf6-397d-45d6-b5ae-94c39734b168", + "modelName": "2017-388_PASQUALE-vPE", + "modelVersion": "4.0", + "modelCustomizationId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c", + "modelCustomizationName": "2017-388_PASQUALE-vPE 0", + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168" + }, + "instanceName": "2017388_PASQUALEvPEmCaNkinstanceName", + "action": "None", + "legacyRegion": "some legacy region" + }, + "2017-488_PASQUALE-vPE 0": { + "vfModules": {}, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "orchStatus": "Created", + "inMaint": false, + "instanceId": "VNF_INSTANCE_ID", + "instanceName": "2017488_PASQUALEvPEVNFinstancename", + "action": "None_Delete", + "legacyRegion": "some legacy region" + }, + "2017-488_PASQUALE-vPE 0:0001": { + "vfModules": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "instanceName": "VFinstancenameZERO_001", + "action": "None", + "provStatus": "Prov Status", + "inMaint": true, + "modelInfo": { + "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", + "modelVersion": "5", + "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + }, + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + } + }, + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": { + "instanceName": "VFinstancename_001", + "action": "None", + "volumeGroupName": "VFinstancename_vol_abc_001", + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + } + } + }, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "instanceName": "2017488_PASQUALEvPEVNFinstancename_001", + "action": "None", + "legacyRegion": "some legacy region" + }, + "2017-488_PASQUALE-vPE 0:0002": { + "vfModules": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "instanceName": "VFinstancenameZERO_002", + "action": "None", + "modelInfo": { + "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", + "modelVersion": "5", + "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + }, + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + } + }, + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": { + "instanceName": "VFinstancename_002", + "action": "None", + "volumeGroupName": "VFinstancename_vol_abc_002", + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + } + } + }, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "instanceName": "2017488_PASQUALEvPEVNFinstancename_002", + "action": "None", + "legacyRegion": "some legacy region" + }, + "2017-388_PASQUALE-vPE 0_1": { + "action": "Create", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "2017-388_PASQUALE-vPE 0", + "isMissingData": false, + "trackById": "wk10c4hh1oj", + "vfModules": {}, + "vnfStoreKey": "2017-388_PASQUALE-vPE 0_1", + "instanceName": "2017388_PASQUALEvPEmCaNkinstanceName", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "lcpCloudRegionId": "hvf6", + "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e", + "platformName": "xxx1", + "lineOfBusiness": "zzz1", + "instanceParams": [ + { + "vnf_config_template_version": "17.2", + "bandwidth_units": "Gbps", + "bandwidth": "10", + "AIC_CLLI": "ATLMY8GA", + "ASN": "AV_vPE", + "vnf_instance_name": "mtnj309me6" + } + ], + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "afacccf6-397d-45d6-b5ae-94c39734b168", + "modelName": "2017-388_PASQUALE-vPE", + "modelVersion": "4.0", + "modelCustomizationId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c", + "modelCustomizationName": "2017-388_PASQUALE-vPE 0", + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168", + "modelUniqueId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c" + }, + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168" + } + }, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "mcankinstancename": "" + }, + "existingVNFCounterMap": { + "afacccf6-397d-45d6-b5ae-94c39734b168": 1, + "69e09f68-8b63-4cc9-b9ff-860960b5db09": 3, + "b3c76f73-eeb5-4fb6-9d31-72a889f1811c": 1 + }, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": {}, + "bulkSize": 1, + "instanceId": "f8791436-8d55-4fde-b4d5-72dd2cf13cfb", + "instanceName": "mCaNkinstancename", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType": "TYLER SILVIA", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "hvf6", + "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", + "aicZoneId": "NFT1", + "projectName": "WATKINS", + "rollbackOnFailure": true, + "aicZoneName": "NFTJSSSS-NFT1", + "owningEntityName": "WayneHolland", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "modelInfo": { + "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId": "6b528779-44a3-4472-bdff-9cd15ec93450", + "modelName": "action-data", + "modelVersion": "1.0", + "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450" + }, + "isALaCarte": true, + "orchStatus": "Active", + "modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450", + "testApi": "VNF_API" +}
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/volumegroup_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/volumegroup_instantiation_request.json index 02d2d1e14..8d64ebefb 100644 --- a/vid-app-common/src/test/resources/payload_jsons/volumegroup_instantiation_request.json +++ b/vid-app-common/src/test/resources/payload_jsons/volumegroup_instantiation_request.json @@ -12,7 +12,7 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner" : "att-aic" + "cloudOwner" : "irma-aic" }, "requestInfo": { "instanceName": "myVgName", @@ -50,7 +50,8 @@ ], "requestParameters" : { "userParams" : [ ], - "usePreload" : true + "usePreload" : true, + "testApi" : "VNF_API" } } } diff --git a/vid-app-common/src/test/resources/payload_jsons/vrfEntry/service_with_vrf_entry_fe_input.json b/vid-app-common/src/test/resources/payload_jsons/vrfEntry/service_with_vrf_entry_fe_input.json new file mode 100644 index 000000000..4f20cf19c --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vrfEntry/service_with_vrf_entry_fe_input.json @@ -0,0 +1,81 @@ +{ + "action": "Create", + "isDirty": false, + "vnfs": {}, + "vrfs": { + "vrf-1": { + "networks": { + "Network-1": { + "instanceName": "myBestNetwork", + "instanceId": "884b373f-41c0-4a96-9785-7f075cb4ae9d", + "modelInfo": { + "modelType": "network" + } + } + }, + "vpns": { + "vpn-1": { + "instanceName": "justFakeVPN", + "instanceId": "7e971d5c-6ddf-4f02-be8a-95dcbc7daf83", + "modelInfo": { + "modelType": "vpnBinding" + } + } + } + } + }, + "instanceParams": [ + {} + ], + "validationCounter": 0, + "existingNames": { + "dfd": "" + }, + "existingVNFCounterMap": {}, + "existingVRFCounterMap": {}, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {}, + "optionalGroupMembersMap": {}, + "networks": {}, + "vnfGroups": {}, + "bulkSize": 1, + "instanceName": "dfd", + "productFamilyId": "ddf9cc0f-6331-4d35-bed0-a37f2d5e9cb3", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriberName": "SILVIA ROBBINS", + "subscriptionServiceType": "TYLER SILVIA", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "lcpCloudRegionId": "lcpCloudRegionId", + "tenantName": "tenantName", + "tenantId": "4b273bc5-0ae6-4088-aa5d-5a862d84cab2", + "projectName": "WATKINS", + "rollbackOnFailure": "true", + "aicZoneName": null, + "owningEntityName": "WayneHolland", + "testApi": "VNF_API", + "modelInfo": { + "modelInvariantId": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", + "modelVersionId": "f028b2e2-7080-4b13-91b2-94944d4c42d8", + "modelName": "infraVPN", + "modelVersion": "1.0", + "uuid": "f028b2e2-7080-4b13-91b2-94944d4c42d8", + "modelUniqueId": "f028b2e2-7080-4b13-91b2-94944d4c42d8" + }, + "isALaCarte": true, + "name": "infraVPN", + "version": "1.0", + "description": "ddd", + "category": "Network Service", + "uuid": "f028b2e2-7080-4b13-91b2-94944d4c42d8", + "invariantUuid": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", + "serviceType": "BONDING", + "serviceRole": "INFRASTRUCTURE-VPN", + "vidNotions": { + "instantiationType": "Macro", + "instantiationUI": "infrastructureVpn", + "modelCategory": "INFRASTRUCTURE_VPN", + "viewEditUI": "legacy" + }, + "isEcompGeneratedNaming": true, + "isMultiStepDesign": false +}
\ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vrfEntry/service_with_vrf_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/vrfEntry/service_with_vrf_instantiation_request.json new file mode 100644 index 000000000..2e64554a3 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vrfEntry/service_with_vrf_instantiation_request.json @@ -0,0 +1,59 @@ +{ + "requestDetails": { + "modelInfo": { + "modelInvariantId": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", + "modelVersionId": "f028b2e2-7080-4b13-91b2-94944d4c42d8", + "modelName": "infraVPN", + "modelVersion": "1.0", + "modelType": "service" + }, + "cloudConfiguration": { + "cloudOwner": "irma-aic", + "lcpCloudRegionId": "lcpCloudRegionId", + "tenantId": "4b273bc5-0ae6-4088-aa5d-5a862d84cab2" + }, + "owningEntity": { + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "owningEntityName": "WayneHolland" + }, + "project": { + "projectName": "WATKINS" + }, + "subscriberInfo": { + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriberName": "SILVIA ROBBINS" + }, + "requestInfo": { + "instanceName": "dfd", + "productFamilyId": "ddf9cc0f-6331-4d35-bed0-a37f2d5e9cb3", + "source": "VID", + "suppressRollback": false, + "requestorId": "az2016" + }, + "requestParameters": { + "subscriptionServiceType": "TYLER SILVIA", + "aLaCarte": false, + "userParams": [] + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "7e971d5c-6ddf-4f02-be8a-95dcbc7daf83", + "instanceName": "justFakeVPN", + "modelInfo": { + "modelType": "vpnBinding" + } + } + }, + { + "relatedInstance": { + "instanceId": "884b373f-41c0-4a96-9785-7f075cb4ae9d", + "instanceName": "myBestNetwork", + "modelInfo": { + "modelType": "network" + } + } + } + ] + } +}
\ No newline at end of file |