Add cloud-region and nf-role as an optional search criteria

Issue-ID: VID-596
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Change-Id: I72d9c2c9dc3f39fcc3c87e083ac230d20135e979

2 files changed, 405 insertions, 0 deletions

diff --git a/vid-app-common/src/test/resources/payload_jsons/changeManagement/vnfs-fromServiceInstance-filterByCloudRegion.json b/vid-app-common/src/test/resources/payload_jsons/changeManagement/vnfs-fromServiceInstance-filterByCloudRegion.json
new file mode 100644
index 000000000..ac20d9142
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/changeManagement/vnfs-fromServiceInstance-filterByCloudRegion.json
@@ -0,0 +1,189 @@
+{
+   "results": [
+      {
+      "id": "1165906024",
+      "node-type": "service-instance",
+      "url": "/aai/v17/business/customers/customer/globalCustomerId1-360-as988q/service-subscriptions/service-subscription/TEST1-360/service-instances/service-instance/serviceInstanceID1-360-as988q",
+      "properties":       {
+         "service-instance-id": "serviceInstanceID1-360-as988q",
+         "service-instance-name": "EUd8Test",
+         "service-type": "xBoJHJbWTest",
+         "service-role": "sc7OWTest",
+         "environment-context": "O7OVp5Test",
+         "workload-context": "VmnxNeJIgWq7HTest",
+         "model-invariant-id": "modelInvariantValue2-360-as988q",
+         "model-version-id": "modelVersionKey2-360-as988q",
+         "widget-model-id": "HT7KA2FoRKH3cTest",
+         "widget-model-version": "CsGp5Test",
+         "bandwidth-total": "1Yijkk1Test",
+         "vhn-portal-url": "40PzTest",
+         "service-instance-location-id": "zcAaHJTAt5Hj8Test",
+         "resource-version": "1563819746503",
+         "selflink": "mZP2EVvwwHnlTest",
+         "orchestration-status": "6QvhzNgLudLBTest"
+      },
+      "related-to":       [
+                  {
+            "id": "848404488",
+            "relationship-label": "org.onap.relationships.inventory.ComposedOf",
+            "node-type": "generic-vnf",
+            "url": "/aai/v17/network/generic-vnfs/generic-vnf/test-gvnf2-360-as988q"
+         },
+                  {
+            "id": "890142720",
+            "relationship-label": "org.onap.relationships.inventory.ComposedOf",
+            "node-type": "generic-vnf",
+            "url": "/aai/v17/network/generic-vnfs/generic-vnf/test-gvnf1-360-as988q"
+         },
+                  {
+            "id": "439140528",
+            "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+            "node-type": "service-subscription",
+            "url": "/aai/v17/business/customers/customer/globalCustomerId1-360-as988q/service-subscriptions/service-subscription/TEST1-360"
+         }
+      ]
+   },
+      {
+      "id": "439132336",
+      "node-type": "model-ver",
+      "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue2-360-as988q/model-vers/model-ver/modelVersionKey2-360-as988q",
+      "properties":       {
+         "model-version-id": "modelVersionKey2-360-as988q",
+         "model-name": "vnfc8",
+         "model-version": "1.1",
+         "resource-version": "1563819746176"
+      },
+      "related-to": [      {
+         "id": "908283976",
+         "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+         "node-type": "model",
+         "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue2-360-as988q"
+      }]
+   },
+      {
+      "id": "908283976",
+      "node-type": "model",
+      "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue2-360-as988q",
+      "properties":       {
+         "model-invariant-id": "modelInvariantValue2-360-as988q",
+         "model-type": "widget3",
+         "resource-version": "1563819745871"
+      },
+      "related-to": [      {
+         "id": "439132336",
+         "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+         "node-type": "model-ver",
+         "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue2-360-as988q/model-vers/model-ver/modelVersionKey2-360-as988q"
+      }]
+   },
+      {
+      "id": "890142720",
+      "node-type": "generic-vnf",
+      "url": "/aai/v17/network/generic-vnfs/generic-vnf/test-gvnf1-360-as988q",
+      "properties":       {
+         "vnf-id": "test-gvnf1-360-as988q",
+         "vnf-name": "test-name-gvnf-360",
+         "vnf-type": "SW",
+         "service-id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
+         "equipment-role": "UCPE",
+         "orchestration-status": "created",
+         "ipv4-oam-address": "12.80.1.18",
+         "nm-lan-v6-address": "2001:1890:e00e:fffe::33c4",
+         "in-maint": false,
+         "is-closed-loop-disabled": false,
+         "resource-version": "1563819747496",
+         "model-invariant-id": "modelInvariantValue-360-as988q",
+         "model-version-id": "modelVersionKey-360-as988q",
+         "nf-role": "test360"
+      },
+      "related-to":       [
+                  {
+            "id": "1165906024",
+            "relationship-label": "org.onap.relationships.inventory.ComposedOf",
+            "node-type": "service-instance",
+            "url": "/aai/v17/business/customers/customer/globalCustomerId1-360-as988q/service-subscriptions/service-subscription/TEST1-360/service-instances/service-instance/serviceInstanceID1-360-as988q"
+         },
+                  {
+            "id": "848400392",
+            "relationship-label": "tosca.relationships.HostedOn",
+            "node-type": "vserver",
+            "url": "/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloudOwnerKeyValue1-360-as988q/cloudRegionIdKeyValue1-360-as988q/tenants/tenant/tenantID1-360-as988q/vservers/vserver/vserver1-360-test-as988q"
+         }
+      ]
+   },
+      {
+      "id": "1054167104",
+      "node-type": "model-ver",
+      "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue-360-as988q/model-vers/model-ver/modelVersionKey-360-as988q",
+      "properties":       {
+         "model-version-id": "modelVersionKey-360-as988q",
+         "model-name": "vnfc8",
+         "model-version": "1.1",
+         "resource-version": "1563819745556"
+      },
+      "related-to": [      {
+         "id": "1054163008",
+         "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+         "node-type": "model",
+         "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue-360-as988q"
+      }]
+   },
+      {
+      "id": "1054163008",
+      "node-type": "model",
+      "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue-360-as988q",
+      "properties":       {
+         "model-invariant-id": "modelInvariantValue-360-as988q",
+         "model-type": "service",
+         "resource-version": "1563819745252"
+      },
+      "related-to": [      {
+         "id": "1054167104",
+         "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+         "node-type": "model-ver",
+         "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue-360-as988q/model-vers/model-ver/modelVersionKey-360-as988q"
+      }]
+   },
+      {
+      "id": "521560160",
+      "node-type": "tenant",
+      "url": "/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloudOwnerKeyValue1-360-as988q/cloudRegionIdKeyValue1-360-as988q/tenants/tenant/tenantID1-360-as988q",
+      "properties":       {
+         "tenant-id": "tenantID1-360-as988q",
+         "tenant-name": "tenant-name1-360-as988q",
+         "resource-version": "1563819744626"
+      },
+      "related-to":       [
+                  {
+            "id": "848400392",
+            "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+            "node-type": "vserver",
+            "url": "/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloudOwnerKeyValue1-360-as988q/cloudRegionIdKeyValue1-360-as988q/tenants/tenant/tenantID1-360-as988q/vservers/vserver/vserver1-360-test-as988q"
+         },
+                  {
+            "id": "1165901928",
+            "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+            "node-type": "cloud-region",
+            "url": "/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloudOwnerKeyValue1-360-as988q/cloudRegionIdKeyValue1-360-as988q"
+         }
+      ]
+   },
+      {
+      "id": "1165901928",
+      "node-type": "cloud-region",
+      "url": "/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloudOwnerKeyValue1-360-as988q/cloudRegionIdKeyValue1-360-as988q",
+      "properties":       {
+         "cloud-owner": "cloudOwnerKeyValue1-360-as988q",
+         "cloud-region-id": "cloudRegionIdKeyValue1-360-as988q",
+         "resource-version": "1563819744324",
+         "orchestration-disabled": false,
+         "in-maint": false
+      },
+      "related-to": [      {
+         "id": "521560160",
+         "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+         "node-type": "tenant",
+         "url": "/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloudOwnerKeyValue1-360-as988q/cloudRegionIdKeyValue1-360-as988q/tenants/tenant/tenantID1-360-as988q"
+      }]
+   }
+]}
\ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/changeManagement/vnfs-fromServiceInstance-filterNfRole.json b/vid-app-common/src/test/resources/payload_jsons/changeManagement/vnfs-fromServiceInstance-filterNfRole.json
new file mode 100644
index 000000000..6cbb7594f
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/changeManagement/vnfs-fromServiceInstance-filterNfRole.json
@@ -0,0 +1,216 @@
+{
+   "results": [
+      {
+      "id": "908419144",
+      "node-type": "service-instance",
+      "url": "/aai/v17/business/customers/customer/globalCustomerId1-369-as988q/service-subscriptions/service-subscription/TEST1-369/service-instances/service-instance/serviceInstanceID1-369-as988q",
+      "properties":       {
+         "service-instance-id": "serviceInstanceID1-369-as988q",
+         "service-instance-name": "EUd8Test",
+         "service-type": "xBoJHJbWTest",
+         "service-role": "sc7OWTest",
+         "environment-context": "O7OVp5Test",
+         "workload-context": "VmnxNeJIgWq7HTest",
+         "model-invariant-id": "modelInvariantValue2-369-as988q",
+         "model-version-id": "modelVersionKey2-369-as988q",
+         "widget-model-id": "HT7KA2FoRKH3cTest",
+         "widget-model-version": "CsGp5Test",
+         "bandwidth-total": "1Yijkk1Test",
+         "vhn-portal-url": "40PzTest",
+         "service-instance-location-id": "zcAaHJTAt5Hj8Test",
+         "resource-version": "1563820653329",
+         "selflink": "mZP2EVvwwHnlTest",
+         "orchestration-status": "6QvhzNgLudLBTest"
+      },
+      "related-to":       [
+                  {
+            "id": "439189680",
+            "relationship-label": "org.onap.relationships.inventory.ComposedOf",
+            "node-type": "generic-vnf",
+            "url": "/aai/v17/network/generic-vnfs/generic-vnf/test-gvnf2-369-as988q"
+         },
+                  {
+            "id": "1166020712",
+            "relationship-label": "org.onap.relationships.inventory.ComposedOf",
+            "node-type": "generic-vnf",
+            "url": "/aai/v17/network/generic-vnfs/generic-vnf/test-gvnf1-369-as988q"
+         },
+                  {
+            "id": "1166016616",
+            "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+            "node-type": "service-subscription",
+            "url": "/aai/v17/business/customers/customer/globalCustomerId1-369-as988q/service-subscriptions/service-subscription/TEST1-369"
+         }
+      ]
+   },
+      {
+      "id": "890175488",
+      "node-type": "model-ver",
+      "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue2-369-as988q/model-vers/model-ver/modelVersionKey2-369-as988q",
+      "properties":       {
+         "model-version-id": "modelVersionKey2-369-as988q",
+         "model-name": "vnfc8",
+         "model-version": "1.1",
+         "resource-version": "1563820653007"
+      },
+      "related-to": [      {
+         "id": "908415048",
+         "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+         "node-type": "model",
+         "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue2-369-as988q"
+      }]
+   },
+      {
+      "id": "908415048",
+      "node-type": "model",
+      "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue2-369-as988q",
+      "properties":       {
+         "model-invariant-id": "modelInvariantValue2-369-as988q",
+         "model-type": "widget3",
+         "resource-version": "1563820652703"
+      },
+      "related-to": [      {
+         "id": "890175488",
+         "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+         "node-type": "model-ver",
+         "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue2-369-as988q/model-vers/model-ver/modelVersionKey2-369-as988q"
+      }]
+   },
+      {
+      "id": "439189680",
+      "node-type": "generic-vnf",
+      "url": "/aai/v17/network/generic-vnfs/generic-vnf/test-gvnf2-369-as988q",
+      "properties":       {
+         "vnf-id": "test-gvnf2-369-as988q",
+         "vnf-name": "test-name2-gvnf-369",
+         "vnf-type": "SW",
+         "service-id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
+         "equipment-role": "UCPE",
+         "orchestration-status": "created",
+         "ipv4-oam-address": "12.80.1.18",
+         "nm-lan-v6-address": "2001:1890:e00e:fffe::33c4",
+         "in-maint": false,
+         "is-closed-loop-disabled": false,
+         "resource-version": "1563820654611",
+         "model-invariant-id": "modelInvariantValue-369-as988q",
+         "model-version-id": "modelVersionKey-369-as988q",
+         "nf-role": "test360"
+      },
+      "related-to": [      {
+         "id": "908419144",
+         "relationship-label": "org.onap.relationships.inventory.ComposedOf",
+         "node-type": "service-instance",
+         "url": "/aai/v17/business/customers/customer/globalCustomerId1-369-as988q/service-subscriptions/service-subscription/TEST1-369/service-instances/service-instance/serviceInstanceID1-369-as988q"
+      }]
+   },
+      {
+      "id": "1166012520",
+      "node-type": "model-ver",
+      "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue-369-as988q/model-vers/model-ver/modelVersionKey-369-as988q",
+      "properties":       {
+         "model-version-id": "modelVersionKey-369-as988q",
+         "model-name": "vnfc8",
+         "model-version": "1.1",
+         "resource-version": "1563820652380"
+      },
+      "related-to": [      {
+         "id": "1166008424",
+         "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+         "node-type": "model",
+         "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue-369-as988q"
+      }]
+   },
+      {
+      "id": "1166008424",
+      "node-type": "model",
+      "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue-369-as988q",
+      "properties":       {
+         "model-invariant-id": "modelInvariantValue-369-as988q",
+         "model-type": "service",
+         "resource-version": "1563820652072"
+      },
+      "related-to": [      {
+         "id": "1166012520",
+         "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+         "node-type": "model-ver",
+         "url": "/aai/v17/service-design-and-creation/models/model/modelInvariantValue-369-as988q/model-vers/model-ver/modelVersionKey-369-as988q"
+      }]
+   },
+      {
+      "id": "1166020712",
+      "node-type": "generic-vnf",
+      "url": "/aai/v17/network/generic-vnfs/generic-vnf/test-gvnf1-369-as988q",
+      "properties":       {
+         "vnf-id": "test-gvnf1-369-as988q",
+         "vnf-name": "test-name-gvnf-369",
+         "vnf-type": "SW",
+         "service-id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
+         "equipment-role": "UCPE",
+         "orchestration-status": "created",
+         "ipv4-oam-address": "12.80.1.18",
+         "nm-lan-v6-address": "2001:1890:e00e:fffe::33c4",
+         "in-maint": false,
+         "is-closed-loop-disabled": false,
+         "resource-version": "1563820654296",
+         "model-invariant-id": "modelInvariantValue-369-as988q",
+         "model-version-id": "modelVersionKey-369-as988q",
+         "nf-role": "test360"
+      },
+      "related-to":       [
+                  {
+            "id": "908419144",
+            "relationship-label": "org.onap.relationships.inventory.ComposedOf",
+            "node-type": "service-instance",
+            "url": "/aai/v17/business/customers/customer/globalCustomerId1-369-as988q/service-subscriptions/service-subscription/TEST1-369/service-instances/service-instance/serviceInstanceID1-369-as988q"
+         },
+                  {
+            "id": "848445448",
+            "relationship-label": "tosca.relationships.HostedOn",
+            "node-type": "vserver",
+            "url": "/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloudOwnerKeyValue1-369-as988q/cloudRegionIdKeyValue1-369-as988q/tenants/tenant/tenantID1-369-as988q/vservers/vserver/vserver1-369-test-as988q"
+         }
+      ]
+   },
+      {
+      "id": "908410952",
+      "node-type": "tenant",
+      "url": "/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloudOwnerKeyValue1-369-as988q/cloudRegionIdKeyValue1-369-as988q/tenants/tenant/tenantID1-369-as988q",
+      "properties":       {
+         "tenant-id": "tenantID1-369-as988q",
+         "tenant-name": "tenant-name1-369-as988q",
+         "resource-version": "1563820651384"
+      },
+      "related-to":       [
+                  {
+            "id": "848445448",
+            "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+            "node-type": "vserver",
+            "url": "/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloudOwnerKeyValue1-369-as988q/cloudRegionIdKeyValue1-369-as988q/tenants/tenant/tenantID1-369-as988q/vservers/vserver/vserver1-369-test-as988q"
+         },
+                  {
+            "id": "1166004328",
+            "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+            "node-type": "cloud-region",
+            "url": "/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloudOwnerKeyValue1-369-as988q/cloudRegionIdKeyValue1-369-as988q"
+         }
+      ]
+   },
+      {
+      "id": "1166004328",
+      "node-type": "cloud-region",
+      "url": "/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloudOwnerKeyValue1-369-as988q/cloudRegionIdKeyValue1-369-as988q",
+      "properties":       {
+         "cloud-owner": "cloudOwnerKeyValue1-369-as988q",
+         "cloud-region-id": "cloudRegionIdKeyValue1-369-as988q",
+         "resource-version": "1563820651058",
+         "orchestration-disabled": false,
+         "in-maint": false
+      },
+      "related-to": [      {
+         "id": "908410952",
+         "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+         "node-type": "tenant",
+         "url": "/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloudOwnerKeyValue1-369-as988q/cloudRegionIdKeyValue1-369-as988q/tenants/tenant/tenantID1-369-as988q"
+      }]
+   }
+]}
\ No newline at end of file