Merge "Dynamic Cloud Owner Support"

2 files changed, 74 insertions, 25 deletions

diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/VnfAndVfModuleMapper/grApiVmNetworkSubSectionWith5GParams.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/VnfAndVfModuleMapper/grApiVmNetworkSubSectionWith5GParams.json
new file mode 100644
index 0000000000..e83f487a64
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/VnfAndVfModuleMapper/grApiVmNetworkSubSectionWith5GParams.json
@@ -0,0 +1,73 @@
+{
+	"network-role": "vmNetworkRole0",
+	"segmentation-id" : "my-segemntation-id",
+	"floating-ips": {
+		"floating-ip-v4": [
+			"floatingIpV40",
+			"floatingIpV41"
+		],
+		"floating-ip-v6": [
+			"floatingIpV60",
+			"floatingIpV61"
+		]
+	},
+	"interface-route-prefixes": {
+		"interface-route-prefix": [
+			"interfaceRoutePrefix0",
+			"interfaceRoutePrefix1"
+		]
+	},
+	"sriov-parameters": {
+		"heat-vlan-filters": {
+			"heat-vlan-filter": [
+				"heatVlanFilter0",
+				"heatVlanFilter1"
+			]
+		}
+	},
+	"network-information-items": {
+		"network-information-item": [
+			{
+				"network-ips": {
+					"network-ip": [
+						"ip0",
+						"ip1"
+					]
+				},
+				"ip-version": "ipv4"
+			},
+			{
+				"network-ips": {
+					"network-ip": [
+						"ip2",
+						"ip3"
+					]
+				},
+				"ip-version": "ipv6"
+			}
+		]
+	},
+	"related-networks" : {
+		"related-network" : [{
+			"vlan-tags" : {
+				"is-private" : "True",
+				"upper-tag-id" : "1"
+			}
+		},{
+			"vlan-tags" : {
+				"is-private" : "False",
+				"upper-tag-id" : "2"
+			}
+		},{
+			"vlan-tags" : {
+				"is-private" : "True",
+				"upper-tag-id" : "3"
+			}
+		},{
+			"vlan-tags" : {
+				"is-private" : "False",
+				"upper-tag-id" : "3"
+			}
+		}]
+	}
+}
\ No newline at end of file
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/application-test.yaml b/bpmn/so-bpmn-tasks/src/test/resources/application-test.yaml
index 4562ebdaea..6f67a9ccc4 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/application-test.yaml
+++ b/bpmn/so-bpmn-tasks/src/test/resources/application-test.yaml
@@ -114,30 +114,6 @@ mso:
           version: '9'
         generic-vnf:
           version: '9'
-        v8:
-          customer:
-            uri: /aai/v8/business/customers/customer
-          generic-query:
-            uri: /aai/v8/search/generic-query
-          l3-network:
-            uri: /aai/v8/network/l3-networks/l3-network
-          network-policy:
-            uri: /aai/v8/network/network-policies/network-policy
-          nodes-query:
-            uri: /aai/v8/search/nodes-query
-          route-table-reference:
-            uri: /aai/v8/network/route-table-references/route-table-reference
-          tenant:
-            uri: /aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant
-          vce:
-            uri: /aai/v8/network/vces/vce
-          vpn-binding:
-            uri: /aai/v8/network/vpn-bindings/vpn-binding
-        v9:
-          cloud-region:
-            uri: /aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic
-          generic-vnf:
-            uri: /aai/v9/network/generic-vnfs/generic-vnf
     global:
       default:
         aai:
@@ -220,4 +196,4 @@ camunda:
   bpm:
     metrics:
       enabled: false
-      db-reporter-activate: false
\ No newline at end of file
+      db-reporter-activate: false