Code Review / so.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
AT&T 1712 and 1802 release code
[so.git] / bpmn / MSOInfrastructureBPMN / src / test / groovy / org / openecomp / mso / bpmn / infrastructure / scripts / DoCreateNetworkInstanceTest.groovy
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceTest.groovy
index b45dd0b..552a560 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceTest.groovy
@@ -14,7 +14,7 @@ import org.camunda.bpm.engine.ProcessEngineServices
 import org.camunda.bpm.engine.RepositoryService\r
 import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity\r
 import org.camunda.bpm.engine.repository.ProcessDefinition\r
-import org.camunda.bpm.engine.runtime.Execution\r
+import org.camunda.bpm.engine.delegate.DelegateExecution\r
 import org.junit.Before\r
 import org.junit.Ignore\r
 import org.junit.Rule\r
@@ -427,6 +427,190 @@ class DoCreateNetworkInstanceTest  {
       <rest:header name="Server" value="Apache-Coyote/1.1"/>\r
       <rest:header name="Cache-Control" value="private"/>\r
    </rest:headers>\r
+   <rest:payload contentType="text/xml">\r
+      <l3-network xmlns="http://org.openecomp.aai.inventory/v6">\r
+         <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>\r
+         <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>\r
+         <network-type>CONTRAIL_EXTERNAL</network-type>\r
+         <network-role>dmz_direct</network-role>\r
+         <network-technology>Contrail</network-technology>\r
+         <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>\r
+         <network-role-instance>0</network-role-instance>\r
+                <resource-version>l3-version</resource-version>\r
+         <orchestration-status>pending-create</orchestration-status>\r
+                <physical-network-name>networkName</physical-network-name>\r
+            <is-provider-network>false</is-provider-network>\r
+                <is-shared-network>true</is-shared-network>\r
+                <is-external-network>false</is-external-network>\r
+         <subnets>\r
+            <subnet>\r
+               <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>\r
+               <gateway-address>107.239.52.1</gateway-address>\r
+               <network-start-address>107.239.52.0</network-start-address>\r
+               <cidr-mask>24</cidr-mask>\r
+               <ip-version>4</ip-version>\r
+               <orchestration-status>pending-create</orchestration-status>\r
+               <dhcp-enabled>true</dhcp-enabled>\r
+                          <subnet-name>subnetName</subnet-name>\r
+                          <ip-assignment-direction>true</ip-assignment-direction>\r
+                          <host-routes>\r
+                 <host-route>\r
+                   <host-route-id>string</host-route-id>\r
+                   <route-prefix>192.10.16.0/24</route-prefix>\r
+                   <next-hop>192.10.16.100/24</next-hop>\r
+                   <next-hop-type>ip-address</next-hop-type> \r
+                                  <resource-version>1505857301954</resource-version>\r
+                 </host-route>\r
+                 <host-route>\r
+                  <host-route-id>string</host-route-id>\r
+                  <route-prefix>192.110.17.0/24</route-prefix>\r
+                  <next-hop>192.110.17.110/24</next-hop>\r
+                  <next-hop-type>ip-address</next-hop-type>\r
+                                 <resource-version>1505857301954</resource-version>\r
+                 </host-route>\r
+               </host-routes>\r
+               <relationship-list/>\r
+            </subnet>\r
+            <subnet>\r
+               <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>\r
+               <gateway-address>107.239.52.1</gateway-address>\r
+               <network-start-address>107.239.52.0</network-start-address>\r
+               <cidr-mask>24</cidr-mask>\r
+               <ip-version>4</ip-version>\r
+               <orchestration-status>pending-create</orchestration-status>\r
+               <dhcp-enabled>true</dhcp-enabled>\r
+                          <subnet-name>subnetName</subnet-name>\r
+                          <ip-assignment-direction>true</ip-assignment-direction>\r
+                          <host-routes>\r
+                 <host-route>\r
+                   <host-route-id>string</host-route-id>\r
+                   <route-prefix>192.10.16.0/24</route-prefix>\r
+                   <next-hop>192.10.16.100/24</next-hop>\r
+                   <next-hop-type>ip-address</next-hop-type> \r
+                                 <resource-version>1505857301954</resource-version>\r
+                 </host-route>\r
+               </host-routes>\r
+               <relationship-list/>\r
+            </subnet>\r
+         </subnets>\r
+                <segmentation-assignments>\r
+                       <segmentation-id>414</segmentation-id>\r
+                       <resource-version>4132176</resource-version>\r
+                </segmentation-assignments>\r
+                <segmentation-assignments>\r
+                       <segmentation-id>415</segmentation-id>\r
+                       <resource-version>4132176</resource-version>\r
+                </segmentation-assignments>\r
+                <ctag-assignments>\r
+                        <ctag-assignment>\r
+                                <vlan-id-inner>inner</vlan-id-inner>\r
+                                <resource-version>ctag-version</resource-version>\r
+                    <relationship-list>\r
+                                       <relationship>\r
+                                          <related-to>tenant</related-to>\r
+                                          <related-link>https://aai-ext1.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/897deadc2b954a6bac6d3c197fb3525e/</related-link>\r
+                                          <relationship-data>\r
+                                                 <relationship-key>tenant.tenant-id</relationship-key>\r
+                                                 <relationship-value>897deadc2b954a6bac6d3c197fb3525e</relationship-value>\r
+                                          </relationship-data>\r
+                                          <related-to-property>\r
+                                                 <property-key>tenant.tenant-name</property-key>\r
+                                                 <property-value>MSOTest1</property-value>\r
+                                          </related-to-property>\r
+                                       </relationship>\r
+                                       <relationship>\r
+                                          <related-to>vpn-binding</related-to>\r
+                                          <related-link>https://aai-ext1.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/a290b841-f672-44dd-b9cd-6f8c20d7d8c8/</related-link>\r
+                                          <relationship-data>\r
+                                                 <relationship-key>vpn-binding.vpn-id</relationship-key>\r
+                                                 <relationship-value>a290b841-f672-44dd-b9cd-6f8c20d7d8c8</relationship-value>\r
+                                          </relationship-data>\r
+                                          <related-to-property>\r
+                                                 <property-key>vpn-binding.vpn-name</property-key>\r
+                                                 <property-value>oam_protected_net_6_MTN5_msotest2</property-value>\r
+                                          </related-to-property>\r
+                                       </relationship>\r
+                                       <relationship>\r
+                                          <related-to>vpn-binding</related-to>\r
+                                          <related-link>https://aai-ext1.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/24a4b507-853a-4a38-99aa-05fcc54be24d/</related-link>\r
+                                          <relationship-data>\r
+                                                 <relationship-key>vpn-binding.vpn-id</relationship-key>\r
+                                                 <relationship-value>24a4b507-853a-4a38-99aa-05fcc54be24d</relationship-value>\r
+                                          </relationship-data>\r
+                                          <related-to-property>\r
+                                                 <property-key>vpn-binding.vpn-name</property-key>\r
+                                                 <property-value>oam_protected_net_6_MTN5_msotest1</property-value>\r
+                                          </related-to-property>\r
+                                       </relationship>\r
+                                </relationship-list>\r
+                               </ctag-assignment>\r
+                </ctag-assignments>\r
+         <relationship-list>\r
+            <relationship>\r
+               <related-to>vpn-binding</related-to>\r
+               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>\r
+               <relationship-data>\r
+                  <relationship-key>vpn-binding.vpn-id</relationship-key>\r
+                  <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>\r
+               </relationship-data>\r
+            </relationship>\r
+            <relationship>\r
+               <related-to>vpn-binding</related-to>\r
+               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>\r
+               <relationship-data>\r
+                  <relationship-key>vpn-binding.vpn-id</relationship-key>\r
+                  <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>\r
+               </relationship-data>\r
+            </relationship>\r
+            <relationship>\r
+               <related-to>tenant</related-to>\r
+               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>\r
+               <relationship-data>\r
+                  <relationship-key>tenant.tenant-id</relationship-key>\r
+                  <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>\r
+               </relationship-data>\r
+            </relationship>\r
+                       <relationship>\r
+                         <related-to>network-policy</related-to>\r
+                         <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg</related-link>\r
+                         <relationship-data>\r
+                                 <relationship-key>network-policy.network-policy-id</relationship-key>\r
+                                 <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0cg</relationship-value>\r
+                         </relationship-data>\r
+                       </relationship>\r
+                       <relationship>\r
+                          <related-to>route-table-reference</related-to>\r
+                      <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/route-table-references/route-table-reference/refFQDN1</related-link>\r
+                          <relationship-data>\r
+                                 <relationship-key>route-table-reference.route-table-reference-id</relationship-key>\r
+                                 <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>\r
+                          </relationship-data>\r
+                       </relationship>\r
+                       <relationship>\r
+                          <related-to>route-table-reference</related-to>\r
+                      <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/route-table-references/route-table-reference/refFQDN2</related-link>\r
+                          <relationship-data>\r
+                                 <relationship-key>route-table-reference.route-table-reference-id</relationship-key>\r
+                                 <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>\r
+                          </relationship-data>\r
+                       </relationship>\r
+         </relationship-list>\r
+      </l3-network>\r
+   </rest:payload>\r
+</rest:RESTResponse>"""\r
+\r
+String queryIdAIIResponse_AlaCarte =\r
+"""<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"\r
+                   statusCode="200">\r
+   <rest:headers>\r
+      <rest:header name="Transfer-Encoding" value="chunked"/>\r
+      <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>\r
+      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>\r
+      <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:502-132671"/>\r
+      <rest:header name="Content-Type" value="application/xml"/>\r
+      <rest:header name="Server" value="Apache-Coyote/1.1"/>\r
+      <rest:header name="Cache-Control" value="private"/>\r
+   </rest:headers>\r
    <rest:payload contentType="text/xml">\r
       <l3-network xmlns="http://org.openecomp.aai.inventory/v6">\r
          <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>\r
@@ -1357,6 +1541,77 @@ String queryIdAIIResponse_SRIOV =
       <routeTableFqdns>refFQDN1</routeTableFqdns>\r
       <routeTableFqdns>refFQDN2</routeTableFqdns>\r
    </contrailNetwork>\r
+   <subnets>\r
+      <allocationPools>\r
+         <start/>\r
+         <end/>\r
+      </allocationPools>\r
+      <cidr>107.239.52.0/24</cidr>\r
+      <enableDHCP>true</enableDHCP>\r
+      <gatewayIp>107.239.52.1</gatewayIp>\r
+      <ipVersion>4</ipVersion>\r
+      <subnetId>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnetId>\r
+      <subnetName>subnetName</subnetName>\r
+      <addrFromStart>true</addrFromStart>\r
+      <hostRoutes>\r
+         <prefix>192.10.16.0/24</prefix>\r
+         <nextHop>192.10.16.100/24</nextHop>\r
+      </hostRoutes>\r
+      <hostRoutes>\r
+         <prefix>192.110.17.0/24</prefix>\r
+         <nextHop>192.110.17.110/24</nextHop>\r
+      </hostRoutes>\r
+   </subnets>\r
+   <subnets>\r
+      <allocationPools>\r
+         <start/>\r
+         <end/>\r
+      </allocationPools>\r
+      <cidr>107.239.52.0/24</cidr>\r
+      <enableDHCP>true</enableDHCP>\r
+      <gatewayIp>107.239.52.1</gatewayIp>\r
+      <ipVersion>4</ipVersion>\r
+      <subnetId>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnetId>\r
+      <subnetName>subnetName</subnetName>\r
+      <addrFromStart>true</addrFromStart>\r
+      <hostRoutes>\r
+         <prefix>192.10.16.0/24</prefix>\r
+         <nextHop>192.10.16.100/24</nextHop>\r
+      </hostRoutes>\r
+   </subnets>\r
+   <skipAAI>true</skipAAI>\r
+   <backout>true</backout>\r
+   <failIfExists>false</failIfExists>\r
+   <msoRequest>\r
+      <requestId>88f65519-9a38-4c4b-8445-9eb4a5a5af56</requestId>\r
+      <serviceInstanceId>f70e927b-6087-4974-9ef8-c5e4d5847ca4</serviceInstanceId>\r
+   </msoRequest>\r
+   <messageId>messageId_generated</messageId>\r
+   <notificationUrl/>\r
+</createNetworkRequest>"""\r
+\r
+String createNetworkRequest_Ipv4 =\r
+"""<createNetworkRequest>\r
+   <cloudSiteId>RDM2WAGPLCP</cloudSiteId>\r
+   <tenantId>7dd5365547234ee8937416c65507d266</tenantId>\r
+   <networkId>49c86598-f766-46f8-84f8-8d1c1b10f9b4</networkId>\r
+   <networkName>MNS-25180-L-01-dmz_direct_net_1</networkName>\r
+   <networkType>CONTRAIL_EXTERNAL</networkType>\r
+   <modelCustomizationUuid>sn5256d1-5a33-55df-13ab-12abad84e222</modelCustomizationUuid>\r
+   <networkTechnology>CONTRAIL</networkTechnology>\r
+   <providerVlanNetwork>\r
+      <physicalNetworkName>networkName</physicalNetworkName>\r
+      <vlans>414,415</vlans>\r
+   </providerVlanNetwork>\r
+   <contrailNetwork>\r
+      <shared>true</shared>\r
+      <external>false</external>\r
+      <routeTargets>13979:105757</routeTargets>\r
+      <routeTargets>13979:105757</routeTargets>\r
+      <policyFqdns>GN_EVPN_Test</policyFqdns>\r
+      <routeTableFqdns>refFQDN1</routeTableFqdns>\r
+      <routeTableFqdns>refFQDN2</routeTableFqdns>\r
+   </contrailNetwork>\r
    <subnets>\r
       <allocationPools>\r
          <start/>\r
@@ -1654,7 +1909,25 @@ String createNetworkRequest_SRIOV =
          <ip-version>4</ip-version>\r
          <orchestration-status>Created</orchestration-status>\r
          <dhcp-enabled>true</dhcp-enabled>\r
+         <resource-version>1505857301954</resource-version>\r
          <subnet-name>subnetName</subnet-name>\r
+         <ip-assignment-direction>true</ip-assignment-direction>\r
+         <host-routes>\r
+            <host-route>\r
+               <host-route-id>string</host-route-id>\r
+               <route-prefix>192.10.16.0/24</route-prefix>\r
+               <next-hop>192.10.16.100/24</next-hop>\r
+               <next-hop-type>ip-address</next-hop-type>\r
+               <resource-version>1505857301954</resource-version>\r
+            </host-route>\r
+            <host-route>\r
+               <host-route-id>string</host-route-id>\r
+               <route-prefix>192.110.17.0/24</route-prefix>\r
+               <next-hop>192.110.17.110/24</next-hop>\r
+               <next-hop-type>ip-address</next-hop-type>\r
+               <resource-version>1505857301954</resource-version>\r
+            </host-route>\r
+         </host-routes>\r
       </subnet>\r
       <subnet>\r
          <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>\r
@@ -1665,7 +1938,18 @@ String createNetworkRequest_SRIOV =
          <ip-version>4</ip-version>\r
          <orchestration-status>Created</orchestration-status>\r
          <dhcp-enabled>true</dhcp-enabled>\r
+         <resource-version>1505857301954</resource-version>\r
          <subnet-name>subnetName</subnet-name>\r
+         <ip-assignment-direction>true</ip-assignment-direction>\r
+         <host-routes>\r
+            <host-route>\r
+               <host-route-id>string</host-route-id>\r
+               <route-prefix>192.10.16.0/24</route-prefix>\r
+               <next-hop>192.10.16.100/24</next-hop>\r
+               <next-hop-type>ip-address</next-hop-type>\r
+               <resource-version>1505857301954</resource-version>\r
+            </host-route>\r
+         </host-routes>\r
       </subnet>\r
    </subnets>\r
    <segmentation-assignments>\r
@@ -2085,12 +2369,12 @@ String assignRpcSDNCRequest =
       <service-information>\r
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>\r
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>\r
-         <onap-model-information>\r
+         <ecomp-model-information>\r
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>\r
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>\r
             <model-version>1.0</model-version>\r
             <model-name>HNGW Protected OAM</model-name>\r
-         </onap-model-information>\r
+         </ecomp-model-information>\r
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>\r
          <global-customer-id>globalId_45678905678</global-customer-id>\r
          <subscriber-name>MSO_1610_dev</subscriber-name>\r
@@ -2098,13 +2382,13 @@ String assignRpcSDNCRequest =
       <network-information>\r
          <network-id>networkId</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <onap-model-information>\r
+         <ecomp-model-information>\r
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>\r
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>\r
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>\r
             <model-version>1</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </onap-model-information>\r
+         </ecomp-model-information>\r
       </network-information>\r
       <network-request-input>\r
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>\r
@@ -2139,12 +2423,12 @@ String activateSDNCRequest =
       <service-information>\r
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>\r
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>\r
-         <onap-model-information>\r
+         <ecomp-model-information>\r
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>\r
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>\r
             <model-version>1.0</model-version>\r
             <model-name>HNGW Protected OAM</model-name>\r
-         </onap-model-information>\r
+         </ecomp-model-information>\r
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>\r
          <global-customer-id>globalId_45678905678</global-customer-id>\r
          <subscriber-name>MSO_1610_dev</subscriber-name>\r
@@ -2152,13 +2436,13 @@ String activateSDNCRequest =
       <network-information>\r
          <network-id>networkId</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <onap-model-information>\r
+         <ecomp-model-information>\r
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>\r
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>\r
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>\r
             <model-version>1</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </onap-model-information>\r
+         </ecomp-model-information>\r
       </network-information>\r
       <network-request-input>\r
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>\r
@@ -2232,12 +2516,12 @@ String sdncRpcRollbackRequest =
       <service-information>\r
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>\r
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>\r
-         <onap-model-information>\r
+         <ecomp-model-information>\r
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>\r
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>\r
             <model-version>1.0</model-version>\r
             <model-name>HNGW Protected OAM</model-name>\r
-         </onap-model-information>\r
+         </ecomp-model-information>\r
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>\r
          <global-customer-id>globalId_45678905678</global-customer-id>\r
          <subscriber-name>MSO_1610_dev</subscriber-name>\r
@@ -2245,13 +2529,13 @@ String sdncRpcRollbackRequest =
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <onap-model-information>\r
+         <ecomp-model-information>\r
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>\r
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>\r
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>\r
             <model-version>1</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </onap-model-information>\r
+         </ecomp-model-information>\r
       </network-information>\r
       <network-request-input>\r
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>\r
@@ -2286,12 +2570,12 @@ String sdncActivateRollbackRequest =
       <service-information>\r
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>\r
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>\r
-         <onap-model-information>\r
+         <ecomp-model-information>\r
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>\r
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>\r
             <model-version>1.0</model-version>\r
             <model-name>HNGW Protected OAM</model-name>\r
-         </onap-model-information>\r
+         </ecomp-model-information>\r
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>\r
          <global-customer-id>globalId_45678905678</global-customer-id>\r
          <subscriber-name>MSO_1610_dev</subscriber-name>\r
@@ -2299,13 +2583,13 @@ String sdncActivateRollbackRequest =
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <onap-model-information>\r
+         <ecomp-model-information>\r
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>\r
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>\r
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>\r
             <model-version>1</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </onap-model-information>\r
+         </ecomp-model-information>\r
       </network-information>\r
       <network-request-input>\r
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>\r
@@ -2461,13 +2745,13 @@ String sdncAdapterWorkflowAssignResponse =
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <onap-model-information>\r
+         <ecomp-model-information>\r
             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>\r
             <model-customization-uuid>customization-uuid</model-customization-uuid>\r
             <model-uuid>uuid</model-uuid>\r
             <model-version>version</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </onap-model-information>\r
+         </ecomp-model-information>\r
       </network-information>\r
       <network-request-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
@@ -2508,13 +2792,13 @@ String sdncAdapterWorkflowAssignResponse =
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <onap-model-information>\r
+         <ecomp-model-information>\r
             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>\r
             <model-customization-uuid>customization-uuid</model-customization-uuid>\r
             <model-uuid>uuid</model-uuid>\r
             <model-version>version</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </onap-model-information>\r
+         </ecomp-model-information>\r
       </network-information>\r
       <network-request-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
@@ -2535,7 +2819,7 @@ String sdncAdapterWorkflowAssignResponse =
 \r
                }\r
 \r
-               public void initializeVariables (Execution mockExecution) {\r
+               public void initializeVariables (DelegateExecution mockExecution) {\r
 \r
                        verify(mockExecution).setVariable(Prefix + "networkRequest", "")\r
                        verify(mockExecution).setVariable(Prefix + "rollbackEnabled", null)\r
@@ -2695,7 +2979,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_adapters_sdnc_resource_endpoint")).thenReturn("http://localhost:8090/SDNCAdapterRpc")\r
 \r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.preProcessRequest(mockExecution)\r
 \r
@@ -2756,7 +3040,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_adapters_network_rest_endpoint")).thenReturn("http://localhost:8090/networks/NetworkAdapter")\r
                        when(mockExecution.getVariable("URN_mso_adapters_sdnc_resource_endpoint")).thenReturn("http://localhost:8090/SDNCAdapterRpc")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.preProcessRequest(mockExecution)\r
 \r
@@ -2787,7 +3071,7 @@ String sdncAdapterWorkflowAssignResponse =
                }\r
 \r
                @Test\r
-               //@Ignore\r
+               @Ignore // 1802 merge\r
                public void preProcessRequest_XML_NetworkRequest() {\r
 \r
                        println "************ preProcessRequest_Payload ************* "\r
@@ -2810,7 +3094,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_adapters_network_rest_endpoint")).thenReturn("http://localhost:8090/networks/NetworkAdapter")\r
                        when(mockExecution.getVariable("URN_mso_adapters_sdnc_resource_endpoint")).thenReturn("http://localhost:8090/SDNCAdapterRpc")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.preProcessRequest(mockExecution)\r
 \r
@@ -2862,7 +3146,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable(Prefix + "rollbackEnabled")).thenReturn("true")\r
                        when(mockExecution.getVariable("mso-request-id")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.prepareCreateNetworkRequest(mockExecution)\r
 \r
@@ -2900,7 +3184,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable(Prefix + "rollbackEnabled")).thenReturn("true")\r
                        when(mockExecution.getVariable("mso-request-id")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.prepareCreateNetworkRequest(mockExecution)\r
 \r
@@ -2911,7 +3195,7 @@ String sdncAdapterWorkflowAssignResponse =
                        // verify set prefix = Prefix + ""\r
                        verify(mockExecution).setVariable("prefix", Prefix)\r
 \r
-                       verify(mockExecution).setVariable(Prefix + "createNetworkRequest", createNetworkRequest)\r
+                       verify(mockExecution).setVariable(Prefix + "createNetworkRequest", createNetworkRequest_Ipv4)\r
 \r
                }\r
                \r
@@ -2923,7 +3207,7 @@ String sdncAdapterWorkflowAssignResponse =
                        ExecutionEntity mockExecution = setupMock()\r
                        // Initialize prerequisite variables\r
                        when(mockExecution.getVariable(Prefix + "networkRequest")).thenReturn(expectedJSONNetworkRequest)\r
-                       when(mockExecution.getVariable(Prefix + "queryIdAAIResponse")).thenReturn(queryIdAIIResponse)\r
+                       when(mockExecution.getVariable(Prefix + "queryIdAAIResponse")).thenReturn(queryIdAIIResponse_AlaCarte)\r
                        when(mockExecution.getVariable(Prefix + "cloudRegionPo")).thenReturn("RDM2WAGPLCP")\r
                        when(mockExecution.getVariable(Prefix + "messageId")).thenReturn("messageId_generated")\r
                        when(mockExecution.getVariable(Prefix + "source")).thenReturn("VID")\r
@@ -2937,7 +3221,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable(Prefix + "rollbackEnabled")).thenReturn("true")\r
                        when(mockExecution.getVariable("mso-request-id")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.prepareCreateNetworkRequest(mockExecution)\r
 \r
@@ -2974,7 +3258,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable(Prefix + "rollbackEnabled")).thenReturn("true")\r
                        when(mockExecution.getVariable("mso-request-id")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.prepareCreateNetworkRequest(mockExecution)\r
 \r
@@ -3009,7 +3293,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("GENGSI_siResourceLink")).thenReturn("https://aai-int1.test.com:8443/aai/v8/business/customers/customer/MSO_1610_dev/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/6d4eb22a-82f1-4257-9f80-4176262cfe69/")\r
 \r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.prepareSDNCRequest(mockExecution)\r
 \r
@@ -3038,7 +3322,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("GENGSI_siResourceLink")).thenReturn("https://aai-int1.test.com:8443/aai/v8/business/customers/customer/MSO_1610_dev/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/6d4eb22a-82f1-4257-9f80-4176262cfe69/")\r
 \r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.prepareSDNCRequest(mockExecution)\r
 \r
@@ -3067,7 +3351,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")\r
                        when(mockExecution.getVariable("GENGSI_siResourceLink")).thenReturn("https://aai-int1.test.com:8443/aai/v8/business/customers/customer/MSO_1610_dev/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/6d4eb22a-82f1-4257-9f80-4176262cfe69/")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.prepareRpcSDNCRequest(mockExecution)\r
 \r
@@ -3096,7 +3380,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")\r
                        when(mockExecution.getVariable("GENGSI_siResourceLink")).thenReturn("https://aai-int1.test.com:8443/aai/v8/business/customers/customer/MSO_1610_dev/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/6d4eb22a-82f1-4257-9f80-4176262cfe69/")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.prepareSDNCRollbackRequest(mockExecution)\r
 \r
@@ -3125,7 +3409,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")\r
                        when(mockExecution.getVariable("GENGSI_siResourceLink")).thenReturn("https://aai-int1.test.com:8443/aai/v8/business/customers/customer/MSO_1610_dev/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/6d4eb22a-82f1-4257-9f80-4176262cfe69/")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.prepareRpcSDNCActivateRequest(mockExecution)\r
 \r
@@ -3156,7 +3440,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")\r
                        when(mockExecution.getVariable("GENGSI_siResourceLink")).thenReturn("https://aai-int1.test.com:8443/aai/v8/business/customers/customer/MSO_1610_dev/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/6d4eb22a-82f1-4257-9f80-4176262cfe69/")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.prepareRpcSDNCRollbackRequest(mockExecution)\r
 \r
@@ -3186,7 +3470,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")\r
                        when(mockExecution.getVariable("GENGSI_siResourceLink")).thenReturn("https://aai-int1.test.com:8443/aai/v8/business/customers/customer/MSO_1610_dev/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/6d4eb22a-82f1-4257-9f80-4176262cfe69/")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.prepareRpcSDNCActivateRollback(mockExecution)\r
 \r
@@ -3219,7 +3503,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
                        when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.callRESTQueryAAINetworkName(mockExecution)\r
 \r
@@ -3255,7 +3539,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
                        when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.callRESTQueryAAINetworkName(mockExecution)\r
 \r
@@ -3276,7 +3560,7 @@ String sdncAdapterWorkflowAssignResponse =
                        println "************ callRESTQueryAAINetworkId ************* "\r
 \r
                        WireMock.reset();\r
-                       MockGetNetworkByIdWithDepth("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_Success.xml", "1");\r
+                       MockGetNetworkByIdWithDepth("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_Success.xml", "all");\r
 \r
                        ExecutionEntity mockExecution = setupMock()\r
                        when(mockExecution.getVariable(Prefix + "assignSDNCResponse")).thenReturn(sdncAdapterWorkflowAssignResponse)\r
@@ -3290,7 +3574,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
                        when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.callRESTQueryAAINetworkId(mockExecution)\r
 \r
@@ -3299,7 +3583,7 @@ String sdncAdapterWorkflowAssignResponse =
                        //preDebugger.printInvocations(mockExecution)\r
 \r
                        verify(mockExecution).setVariable("prefix", Prefix)\r
-                       verify(mockExecution).setVariable(Prefix + "queryIdAAIRequest", "http://localhost:8090/aai/v9/network/l3-networks/l3-network/49c86598-f766-46f8-84f8-8d1c1b10f9b4"+"?depth=1")\r
+                       verify(mockExecution).setVariable(Prefix + "queryIdAAIRequest", "http://localhost:8090/aai/v9/network/l3-networks/l3-network/49c86598-f766-46f8-84f8-8d1c1b10f9b4"+"?depth=all")\r
                        verify(mockExecution).setVariable(Prefix + "aaiIdReturnCode", "200")\r
 \r
                }\r
@@ -3326,7 +3610,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
                        when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.callRESTQueryAAICloudRegion(mockExecution)\r
 \r
@@ -3363,7 +3647,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
                        when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.callRESTQueryAAICloudRegion(mockExecution)\r
 \r
@@ -3400,7 +3684,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
                        when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.callRESTQueryAAICloudRegion(mockExecution)\r
 \r
@@ -3439,7 +3723,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
                        when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.callRESTQueryAAINetworkVpnBinding(mockExecution)\r
 \r
@@ -3456,6 +3740,39 @@ String sdncAdapterWorkflowAssignResponse =
 \r
                }\r
 \r
+               @Test\r
+               //@Ignore\r
+               public void callRESTQueryAAINetworkVpnBindingList_200() {\r
+\r
+                       println "************ callRESTQueryAAINetworkVpnBinding_200 ************* "\r
+\r
+                       WireMock.reset();\r
+                       MockGetNetworkVpnBinding("CreateNetworkV2/createNetwork_queryVpnBindingList_AAIResponse_Success.xml", "85f015d0-2e32-4c30-96d2-87a1a27f8017");\r
+                       MockGetNetworkVpnBinding("CreateNetworkV2/createNetwork_queryVpnBindingList_AAIResponse_Success.xml", "c980a6ef-3b88-49f0-9751-dbad8608d0a6");\r
+\r
+                       ExecutionEntity mockExecution = setupMock()\r
+                       when(mockExecution.getVariable(Prefix + "queryIdAAIResponse")).thenReturn(queryIdAIIResponse) // v6\r
+                       when(mockExecution.getVariable(Prefix + "messageId")).thenReturn("e8ebf6a0-f8ea-4dc0-8b99-fe98a87722d6")\r
+                       when(mockExecution.getVariable("URN_aai_endpoint")).thenReturn("http://localhost:8090")\r
+                       when(mockExecution.getVariable("URN_mso_workflow_DoCreateNetworkInstance_aai_vpn_binding_uri")).thenReturn("/aai/v8/network/vpn-bindings/vpn-binding")\r
+                       when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")\r
+                       when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')\r
+                       when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
+                       when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
+\r
+                       // preProcessRequest(DelegateExecution execution)\r
+                       DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
+                       DoCreateNetworkInstance.callRESTQueryAAINetworkVpnBinding(mockExecution)\r
+\r
+                       verify(mockExecution).setVariable("prefix", Prefix)\r
+                       verify(mockExecution).setVariable(Prefix + "vpnCount", 2)\r
+                       verify(mockExecution).setVariable(Prefix + "vpnBindings", ['/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/', '/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/'])\r
+                       // the last vpnBinding value is saved.\r
+                       verify(mockExecution).setVariable(Prefix + "queryVpnBindingAAIRequest", "http://localhost:8090/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017?depth=all")\r
+                       verify(mockExecution, atLeast(2)).setVariable(Prefix + "aaiQqueryVpnBindingReturnCode", "200")\r
+\r
+               }\r
+               \r
                @Test\r
                //@Ignore\r
                public void callRESTQueryAAINetworkVpnBinding_TestScenario01_200() {\r
@@ -3477,7 +3794,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
                        when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.callRESTQueryAAINetworkVpnBinding(mockExecution)\r
 \r
@@ -3517,7 +3834,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
                        when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.callRESTQueryAAINetworkVpnBinding(mockExecution)\r
 \r
@@ -3557,7 +3874,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
                        when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.callRESTQueryAAINetworkVpnBinding(mockExecution)\r
 \r
@@ -3594,7 +3911,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
                        when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.callRESTQueryAAINetworkPolicy(mockExecution)\r
 \r
@@ -3633,7 +3950,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
                        when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.callRESTQueryAAINetworkTableRef(mockExecution)\r
 \r
@@ -3657,7 +3974,7 @@ String sdncAdapterWorkflowAssignResponse =
                        println "************ callRESTReQueryAAINetworkId ************* "\r
 \r
                        WireMock.reset();\r
-                       MockGetNetworkByIdWithDepth("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_Success.xml", "1");\r
+                       MockGetNetworkByIdWithDepth("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "CreateNetworkV2/createNetwork_queryNetworkId_AAIResponse_Success.xml", "all");\r
 \r
                        ExecutionEntity mockExecution = setupMock()\r
                        when(mockExecution.getVariable(Prefix + "networkId")).thenReturn("49c86598-f766-46f8-84f8-8d1c1b10f9b4")\r
@@ -3672,7 +3989,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
                        when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.callRESTReQueryAAINetworkId(mockExecution)\r
 \r
@@ -3681,7 +3998,7 @@ String sdncAdapterWorkflowAssignResponse =
                        //preDebugger.printInvocations(mockExecution)\r
 \r
                        verify(mockExecution).setVariable("prefix", Prefix)\r
-                       verify(mockExecution).setVariable(Prefix + "requeryIdAAIRequest", "http://localhost:8090/aai/v9/network/l3-networks/l3-network/49c86598-f766-46f8-84f8-8d1c1b10f9b4"+"?depth=1")\r
+                       verify(mockExecution).setVariable(Prefix + "requeryIdAAIRequest", "http://localhost:8090/aai/v9/network/l3-networks/l3-network/49c86598-f766-46f8-84f8-8d1c1b10f9b4"+"?depth=all")\r
                        verify(mockExecution).setVariable(Prefix + "aaiRequeryIdReturnCode", "200")\r
 \r
                }\r
@@ -3693,7 +4010,7 @@ String sdncAdapterWorkflowAssignResponse =
                        println "************ callRESTUpdateContrailAAINetwork ************* "\r
 \r
                        WireMock.reset();\r
-                       MockPutNetworkIdWithDepth("CreateNetworkV2/createNetwork_updateContrail_AAIResponse_Success.xml", "49c86598-f766-46f8-84f8-8d1c1b10f9b4", "1");\r
+                       MockPutNetworkIdWithDepth("CreateNetworkV2/createNetwork_updateContrail_AAIResponse_Success.xml", "49c86598-f766-46f8-84f8-8d1c1b10f9b4", "all");\r
 \r
                        ExecutionEntity mockExecution = setupMock()\r
                        when(mockExecution.getVariable(Prefix + "networkId")).thenReturn("49c86598-f766-46f8-84f8-8d1c1b10f9b4")\r
@@ -3709,7 +4026,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
                        when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.callRESTUpdateContrailAAINetwork(mockExecution)\r
 \r
@@ -3718,7 +4035,7 @@ String sdncAdapterWorkflowAssignResponse =
                        //preDebugger.printInvocations(mockExecution)\r
 \r
                        verify(mockExecution).setVariable("prefix", Prefix)\r
-                       verify(mockExecution).setVariable(Prefix + "updateContrailAAIUrlRequest", "http://localhost:8090/aai/v9/network/l3-networks/l3-network/49c86598-f766-46f8-84f8-8d1c1b10f9b4"+"?depth=1")\r
+                       verify(mockExecution).setVariable(Prefix + "updateContrailAAIUrlRequest", "http://localhost:8090/aai/v9/network/l3-networks/l3-network/49c86598-f766-46f8-84f8-8d1c1b10f9b4"+"?depth=all")\r
                        verify(mockExecution).setVariable(Prefix + "updateContrailAAIPayloadRequest", updateContrailAAIPayloadRequest)\r
                        verify(mockExecution).setVariable(Prefix + "aaiUpdateContrailReturnCode", "200")\r
                        //verify(mockExecution).setVariable(Prefix + "updateContrailAAIResponse", updateContrailAAIResponse)\r
@@ -3733,7 +4050,7 @@ String sdncAdapterWorkflowAssignResponse =
                        println "************ callRESTUpdateContrailAAINetwork ************* "\r
 \r
                        WireMock.reset();\r
-                       MockPutNetworkIdWithDepth("CreateNetworkV2/createNetwork_updateContrail_AAIResponse_Success.xml", "49c86598-f766-46f8-84f8-8d1c1b10f9b4", "1");\r
+                       MockPutNetworkIdWithDepth("CreateNetworkV2/createNetwork_updateContrail_AAIResponse_Success.xml", "49c86598-f766-46f8-84f8-8d1c1b10f9b4", "all");\r
 \r
                        ExecutionEntity mockExecution = setupMock()\r
                        when(mockExecution.getVariable(Prefix + "networkId")).thenReturn("49c86598-f766-46f8-84f8-8d1c1b10f9b4")\r
@@ -3749,7 +4066,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")\r
                        when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.callRESTUpdateContrailAAINetwork(mockExecution)\r
 \r
@@ -3758,7 +4075,7 @@ String sdncAdapterWorkflowAssignResponse =
                        //preDebugger.printInvocations(mockExecution)\r
 \r
                        verify(mockExecution).setVariable("prefix", Prefix)\r
-                       verify(mockExecution).setVariable(Prefix + "updateContrailAAIUrlRequest", "http://localhost:8090/aai/v9/network/l3-networks/l3-network/49c86598-f766-46f8-84f8-8d1c1b10f9b4"+"?depth=1")\r
+                       verify(mockExecution).setVariable(Prefix + "updateContrailAAIUrlRequest", "http://localhost:8090/aai/v9/network/l3-networks/l3-network/49c86598-f766-46f8-84f8-8d1c1b10f9b4"+"?depth=all")\r
                        verify(mockExecution).setVariable(Prefix + "updateContrailAAIPayloadRequest", updateContrailAAIPayloadRequest_segmentation)\r
                        verify(mockExecution).setVariable(Prefix + "aaiUpdateContrailReturnCode", "200")\r
                        //verify(mockExecution).setVariable(Prefix + "updateContrailAAIResponse", updateContrailAAIResponse)\r
@@ -3929,7 +4246,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable(Prefix + "rollbackNetworkRequest")).thenReturn(rollbackNetworkRequest)\r
                        when(mockExecution.getVariable("WorkflowException")).thenReturn(workflowException)\r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.prepareRollbackData(mockExecution)\r
 \r
@@ -3953,7 +4270,7 @@ String sdncAdapterWorkflowAssignResponse =
                        when(mockExecution.getVariable(Prefix + "rollbackActivateSDNCRequest")).thenReturn(sdncActivateRollbackRequest)\r
 \r
 \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstance DoCreateNetworkInstance = new DoCreateNetworkInstance()\r
                        DoCreateNetworkInstance.postProcessResponse(mockExecution)\r
 \r
@@ -3985,4 +4302,4 @@ String sdncAdapterWorkflowAssignResponse =
 \r
                        return mockExecution\r
                }\r
-}
+}
\ No newline at end of file
Service Orchestrator