X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_network-topology-operation-assign.xml;h=9fd7e92ab8c3de310aac2663996ea81bafbda83c;hb=9973bf478f9ffa5a89fc0c8b84e485876324df80;hp=66e402e60afd66a7bbe434f868fff587c9b1fe8f;hpb=7818a148f53081c4159f49824f739c47cc7c0da6;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml
index 66e402e6..9fd7e92a 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml
@@ -2,8 +2,8 @@
 <block atomic="true"><switch test='`$network-model.is-bound-to-vpn`'>
 <outcome value='Y'>
 <block atomic="true">
-<get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from VPN_BINDINGS WHERE network_customization_uuid = $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid'
+<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+  key='SELECT * from VPN_BINDINGS WHERE network_customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid'
   pfx='vpn-bindings[]'>
 
 <outcome value='success'>
@@ -45,7 +45,7 @@
 
 </return></outcome></get-resource></block></outcome></switch><get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="tenant" 
-		key="cloud-region.cloud-owner = 'att-aic' AND 
+		key="cloud-region.cloud-owner = 'CloudOwner' AND 
 		     cloud-region.cloud-region-id = $network-topology-operation-input.network-request-input.aic-cloud-region AND
 		     tenant.tenant-id = $network-topology-operation-input.network-request-input.tenant"
         pfx='aai.tenant' local-only='false' >
@@ -84,7 +84,7 @@
     <parameter name="target" value="$role"/>
     <parameter name="replacement" value="`$network-model.network-role`"/>
 
-</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from NETWORK_INSTANCE_NAME_INDEX WHERE network_instance_name_prefix
     = $tmp.network-name-prefix'
   pfx='db.network-name-prefix'>
@@ -98,7 +98,7 @@
 <outcome value='Other'>
 <block atomic="true"><set>
 <parameter name='tmp.index-number' value='`$db.network-name-prefix.index-number+1`' />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key="update NETWORK_INSTANCE_NAME_INDEX
        set index_number = $tmp.index-number
        where network_instance_name_prefix = $db.network-name-prefix.network-instance-name-prefix "
@@ -110,7 +110,7 @@
     <parameter name="error-message" value="Failed to update SERVICE_INSTANCE_NAME_INDEX table" />
 </return></outcome></save></block></outcome><outcome value=''><block atomic="true"><set>
 <parameter name='tmp.index-number' value='1' />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key="insert into NETWORK_INSTANCE_NAME_INDEX values ( $tmp.network-name-prefix , 1)"
   force='false' pfx='pfx'>
 <outcome value='failure'>
@@ -135,7 +135,7 @@
     <parameter name="target" value="$role"/>
     <parameter name="replacement" value="`$network-model.network-role`"/>
 
-</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from NETWORK_INSTANCE_NAME_INDEX WHERE network_instance_name_prefix
     = $tmp.network-name-prefix'
   pfx='db.network-name-prefix'>
@@ -149,7 +149,7 @@
 <outcome value='Other'>
 <block atomic="true"><set>
 <parameter name='tmp.index-number' value='`$db.network-name-prefix.index-number+1`' />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key="update NETWORK_INSTANCE_NAME_INDEX
        set index_number = $tmp.index-number
        where network_instance_name_prefix = $db.network-name-prefix.network-instance-name-prefix "
@@ -161,7 +161,7 @@
     <parameter name="error-message" value="Failed to update SERVICE_INSTANCE_NAME_INDEX table" />
 </return></outcome></save></block></outcome><outcome value=''><block atomic="true"><set>
 <parameter name='tmp.index-number' value='1' />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key="insert into NETWORK_INSTANCE_NAME_INDEX values ( $tmp.network-name-prefix , 1)"
   force='false' pfx='pfx'>
 <outcome value='failure'>
@@ -186,7 +186,7 @@
     <parameter name="target" value="$role"/>
     <parameter name="replacement" value="`$network-model.network-role`"/>
 
-</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from NETWORK_INSTANCE_NAME_INDEX WHERE network_instance_name_prefix
     = $tmp.network-name-prefix'
   pfx='db.network-name-prefix'>
@@ -200,7 +200,7 @@
 <outcome value='Other'>
 <block atomic="true"><set>
 <parameter name='tmp.index-number' value='`$db.network-name-prefix.index-number+1`' />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key="update NETWORK_INSTANCE_NAME_INDEX
        set index_number = $tmp.index-number
        where network_instance_name_prefix = $db.network-name-prefix.network-instance-name-prefix "
@@ -212,7 +212,7 @@
     <parameter name="error-message" value="Failed to update SERVICE_INSTANCE_NAME_INDEX table" />
 </return></outcome></save></block></outcome><outcome value=''><block atomic="true"><set>
 <parameter name='tmp.index-number' value='1' />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key="insert into NETWORK_INSTANCE_NAME_INDEX values ( $tmp.network-name-prefix , 1)"
   force='false' pfx='pfx'>
 <outcome value='failure'>
@@ -237,7 +237,7 @@
     <parameter name="target" value="$role"/>
     <parameter name="replacement" value="`$network-model.network-role`"/>
 
-</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from NETWORK_INSTANCE_NAME_INDEX WHERE network_instance_name_prefix
     = $tmp.network-name-prefix'
   pfx='db.network-name-prefix'>
@@ -251,7 +251,7 @@
 <outcome value='Other'>
 <block atomic="true"><set>
 <parameter name='tmp.index-number' value='`$db.network-name-prefix.index-number+1`' />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key="update NETWORK_INSTANCE_NAME_INDEX
        set index_number = $tmp.index-number
        where network_instance_name_prefix = $db.network-name-prefix.network-instance-name-prefix "
@@ -263,7 +263,7 @@
     <parameter name="error-message" value="Failed to update SERVICE_INSTANCE_NAME_INDEX table" />
 </return></outcome></save></block></outcome><outcome value=''><block atomic="true"><set>
 <parameter name='tmp.index-number' value='1' />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key="insert into NETWORK_INSTANCE_NAME_INDEX values ( $tmp.network-name-prefix , 1)"
   force='false' pfx='pfx'>
 <outcome value='failure'>
@@ -288,7 +288,7 @@
     <parameter name="target" value="$role"/>
     <parameter name="replacement" value="`$network-model.network-role`"/>
 
-</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from NETWORK_INSTANCE_NAME_INDEX WHERE network_instance_name_prefix
     = $tmp.network-name-prefix'
   pfx='db.network-name-prefix'>
@@ -302,7 +302,7 @@
 <outcome value='Other'>
 <block atomic="true"><set>
 <parameter name='tmp.index-number' value='`$db.network-name-prefix.index-number+1`' />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key="update NETWORK_INSTANCE_NAME_INDEX
        set index_number = $tmp.index-number
        where network_instance_name_prefix = $db.network-name-prefix.network-instance-name-prefix "
@@ -314,7 +314,7 @@
     <parameter name="error-message" value="Failed to update SERVICE_INSTANCE_NAME_INDEX table" />
 </return></outcome></save></block></outcome><outcome value=''><block atomic="true"><set>
 <parameter name='tmp.index-number' value='1' />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key="insert into NETWORK_INSTANCE_NAME_INDEX values ( $tmp.network-name-prefix , 1)"
   force='false' pfx='pfx'>
 <outcome value='failure'>
@@ -349,9 +349,9 @@
 <parameter name='tmp.l3-network.network-technology' value="`$network-model.network-technology`" />
 <parameter name='tmp.l3-network.is-bound-to-vpn' value="`$network-model.is-bound-to-vpn`" />
 <parameter name='tmp.l3-network.orchestration-status' value="PendingCreate" />
-<parameter name='tmp.l3-network.model-invariant-id' value="`$network-topology-operation-input.network-information.ecomp-model-information.model-invariant-uuid`" />
-<parameter name='tmp.l3-network.model-version-id' value="`$network-topology-operation-input.network-information.ecomp-model-information.model-version`" />
-<parameter name='tmp.l3-network.model-customization-id' value="`$network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid`" />
+<parameter name='tmp.l3-network.model-invariant-id' value="`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`" />
+<parameter name='tmp.l3-network.model-version-id' value="`$network-topology-operation-input.network-information.onap-model-information.model-version`" />
+<parameter name='tmp.l3-network.model-customization-id' value="`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`" />
 <parameter name='tmp.l3-network.is-provider-network' value="`$network-model.is-provider-network`" />
 <parameter name='tmp.l3-network.is-shared-network' value="`$network-model.is-shared-network`" />
 <parameter name='tmp.l3-network.is-external-network' value="`$network-model.is-external-network`" />
@@ -385,7 +385,7 @@
 
 </set><get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="cloud-region" 
-		key="cloud-region.cloud-owner = 'att-aic' AND 
+		key="cloud-region.cloud-owner = 'CloudOwner' AND 
 		     cloud-region.cloud-region-id = $network-topology-operation-input.network-request-input.aic-cloud-region AND 
 		     depth = '0'"
         pfx='aai.cloud-region' local-only='false' >
@@ -542,7 +542,7 @@
 <parameter name='tmp.network-topology.region-identifier.tenant' value="`$network-topology-operation-input.network-request-input.tenant`" />
 <parameter name='tmp.network-topology.region-identifier.aic-cloud-region' value="`$network-topology-operation-input.network-request-input.aic-cloud-region`" />
 <parameter name='tmp.network-topology.region-identifier.aic-clli' value="`$network-topology-operation-input.network-request-input.aic-clli`" />
-<parameter name='tmp.network-topology.ecomp-model-information.' value="`$network-topology-operation-input.network-information.ecomp-model-information.`" />
+<parameter name='tmp.network-topology.onap-model-information.' value="`$network-topology-operation-input.network-information.onap-model-information.`" />
 <parameter name='tmp.network-topology.network-parameters.' value="`$network-topology-operation-input.network-request-input.network-input-parameters.`" />
 </set><save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="l3-network" 
@@ -690,14 +690,14 @@
 	<!-- create relationship-list -->
 	<parameter name="relationship-list.relationship[0].related-to" value="tenant" />
 	<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="cloud-region.cloud-owner" />
-	<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="att-aic" />
+	<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="CloudOwner" />
 	<parameter name="relationship-list.relationship[0].relationship-data[1].relationship-key" value="cloud-region.cloud-region-id" />
 	<parameter name="relationship-list.relationship[0].relationship-data[1].relationship-value" value="`$network-topology-operation-input.network-request-input.aic-cloud-region`" />
 	<parameter name="relationship-list.relationship[0].relationship-data[2].relationship-key" value="tenant.tenant-id" />
 	<parameter name="relationship-list.relationship[0].relationship-data[2].relationship-value" value="`$network-topology-operation-input.network-request-input.tenant`" />
 	<parameter name="relationship-list.relationship[1].related-to" value="cloud-region" />
 	<parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="cloud-region.cloud-owner" />
-	<parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="att-aic" />
+	<parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="CloudOwner" />
 	<parameter name="relationship-list.relationship[1].relationship-data[1].relationship-key" value="cloud-region.cloud-region-id" />
 	<parameter name="relationship-list.relationship[1].relationship-data[1].relationship-value" value="`$network-topology-operation-input.network-request-input.aic-cloud-region`" />
 	
@@ -742,7 +742,7 @@
 	<parameter name='error-message' value="`'Error writing to l3-network - ' + $tmp.error-message`"/></return></block></block></outcome></save></block></outcome></switch><set>
 <parameter name='network-topology.network-topology-identifier-structure.' value='`$tmp.l3-network.`' />
 <parameter name='network-topology.tenant' value='`$network-topology-operation-input.network-request-input.tenant`' />
-<parameter name='network-topology.ecomp-model-information.' value='`$network-topology-operation-input.network-information.ecomp-model-information.`' />
+<parameter name='network-topology.onap-model-information.' value='`$network-topology-operation-input.network-information.onap-model-information.`' />
 <parameter name='network-topology.network-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' />
 <parameter name='network-topology.aic-cloud-region' value='`$network-topology-operation-input.network-request-input.aic-cloud-region`' /></set><switch test='`$service-data.networks.network_length`'>
 <outcome value=''>