X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_brg-topology-operation-assign.xml;h=21f0efb45ae3b8616d081aa0c2c0e63191a5daa4;hb=65631026c8f90a2c24be8e7411882bb9599a3b87;hp=1d08a1c1b5f0689909d41125288925273521469d;hpb=62cc1c47329b50d6254f0bd41171a9c53e1a30af;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
index 1d08a1c1..21f0efb4 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
@@ -2,107 +2,67 @@
 <block atomic="true"><set>
 <parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
 <parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
-<parameter name='tmp.ar.sz-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />
 
 
 </set><set>
-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'
+<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'
  + $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/brg-topology/'` " />
+ + '/allotted-resource-data/tunnelxconn-topology/'` " />
 
 </set><execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
     <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
     <parameter name='contextPrefix' value='prop' />
 </execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-    <parameter name="source" value="`$prop.restapi.sz-allottedresource`"/>
+    <parameter name="source" value="`$prop.restapi.brg-allottedresource`"/>
     <parameter name="outputPath" value="tmp.ar-url"/>
     <parameter name="target" value="{allotted-resource-id}"/>
     <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-    <parameter name="source" value="`$prop.restapi.vnf-provided-allottedresource`" />
-    <parameter name="outputPath" value="tmp.vnf-p-ar-url" />
-    <parameter name="target" value="{service-instance-id}" />
-    <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`" />
-</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-    <parameter name="source" value="`$tmp.vnf-p-ar-url`" />
-    <parameter name="outputPath" value="tmp.vnf-p-ar-url" />
-    <parameter name="target" value="{vnf-id}"/>
-    <parameter name="replacement" value="`$tmp.ar.sz-vnf-id`"/>
-</execute><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-    <parameter name='restapiUser' value='`$prop.controller.user`' />
-    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-    <parameter name='format' value='json' />
-    <parameter name='httpMethod' value='GET' />
-    <parameter name="responsePrefix" value="mdsal-ar" />
-
-<outcome value='success'>
+</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='brg-allotted-resources/brg-allotted-resource/$brg-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >
+<outcome value='Other'>
 <block atomic="true">
 <set>
-<parameter name='bk-sz-ar' value='$mdsal-ar.' />
-</set><switch test='`$mdsal-ar.brg-allotted-resource_length`'>
-<outcome value='1'>
-<block atomic='true'>
-<set>
-<parameter name='sz-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />
-</set><switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
-<outcome value='Created'>
-<return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" 
-    value="`'Existing brg-allotted-resource with order status of ' + $sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
-</return></outcome><outcome value='PendingDelete'>
-<return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" 
-    value="`'Existing brg-allotted-resource with order status of ' + $sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
-</return></outcome></switch><set>
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
+<parameter name='brg-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+<parameter name='brg-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />
+<parameter name='brg-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />
+<parameter name='brg-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " /></set><set>
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
 
-</set></block></outcome></switch></block></outcome><outcome value='Other'>
-<block atomic="true">
-</block></outcome></execute><set>
-<parameter name='sz-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-<parameter name='sz-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />
-<parameter name='sz-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />
-<parameter name='sz-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " /></set><set>
-<parameter name='sz-ar-identifiers.consuming-service-instance-id' value="`$brg-topology-operation-input.service-information.service-instance-id` " />
-<parameter name='sz-ar-identifiers.parent-service-instance-id' value="`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-<parameter name='sz-ar-identifiers.allotted-resource-type' value="`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
-<parameter name='sz-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+</set><set>
+<parameter name='brg-ar-identifiers.consuming-service-instance-id' value="`$brg-topology-operation-input.service-information.service-instance-id` " />
+<parameter name='brg-ar-identifiers.parent-service-instance-id' value="`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+<parameter name='brg-ar-identifiers.allotted-resource-type' value="`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+<parameter name='brg-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
 
 </set><set>
-<parameter name='sz-ar.allotted-resource-data.brg-topology.onap-model-information.' 
+<parameter name='tx-ar.allotted-resource-data.brg-topology.onap-model-information.' 
 value="`$brg-topology-operation-input.allotted-resource-information.onap-model-information.`" />
 
 
 </set><switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>
 <outcome value=''>
 <set>
-<parameter name='sz-ar.allotted-resource-data.brg-topology.onap-model-information.model-invariant-uuid' 
+<parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-invariant-uuid' 
 value="`$ar-model.invariant-uuid`" />
 
 
 </set></outcome></switch><switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>
 <outcome value=''>
 <set>
-<parameter name='sz-ar.allotted-resource-data.brg-topology.onap-model-information.model-uuid' 
+<parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-uuid' 
 value="`$ar-model.uuid`" />
 
 
 </set></outcome></switch><switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>
 <outcome value=''>
 <set>
-<parameter name='sz-ar.allotted-resource-data.brg-topology.onap-model-information.model-version' 
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version' 
 value="`$ar-model.version`" />
 
 
@@ -110,7 +70,7 @@ value="`$ar-model.version`" />
 <outcome value='Y'>
 <block atomic="true">
 <switch test='`$ar-model.naming-policy`'>
-<outcome value='oam_security_zone_name'>
+<outcome value='oam_network_policy'>
 <block atomic='true'>
 <set>
 <parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />
@@ -118,16 +78,16 @@ value="`$ar-model.version`" />
     <parameter name="source" value="`$tmp.ar-name`"/>
     <parameter name="outputPath" value="tmp.ar-name"/>
     <parameter name="target" value="$TenantOAMNetworkRole"/>
-    <parameter name="replacement" value="`$brg-topology-operation-input.brg-request-input.untrusted-network-role`"/>
+    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`"/>
 
 </execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
     <parameter name="source" value="`$tmp.ar-name`"/>
     <parameter name="outputPath" value="tmp.ar-name"/>
     <parameter name="target" value="$LandingNetworkRole"/>
-    <parameter name="replacement" value="`$brg-topology-operation-input.brg-request-input.trusted-network-role`"/>
+    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`"/>
 
 </execute><set>
-<parameter name='sz-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />
+<parameter name='brg-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />
 </set></block></outcome><outcome value='Other'>
 <block atomic='true'>
 <set>
@@ -136,16 +96,16 @@ value="`$ar-model.version`" />
     <parameter name="source" value="`$tmp.ar-name`"/>
     <parameter name="outputPath" value="tmp.ar-name"/>
     <parameter name="target" value="$TenantOAMNetworkRole"/>
-    <parameter name="replacement" value="`$brg-topology-operation-input.brg-request-input.untrusted-network-role`"/>
+    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`"/>
 
 </execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
     <parameter name="source" value="`$tmp.ar-name`"/>
     <parameter name="outputPath" value="tmp.ar-name"/>
     <parameter name="target" value="$LandingNetworkRole"/>
-    <parameter name="replacement" value="`$brg-topology-operation-input.brg-request-input.trusted-network-role`"/>
+    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`"/>
 
 </execute><set>
-<parameter name='sz-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />
+<parameter name='brg-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />
 </set></block></outcome></switch></block></outcome><outcome value='Other'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
@@ -153,25 +113,15 @@ value="`$ar-model.version`" />
     <parameter name="error-message" value="Error in allotted-resource-model data.  Ecomp-generated-naming should be true" />
 
 </return></outcome></switch><set>
-<parameter name='sz-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.' 
-value="`$sz-ar-identifiers.`" />
+<parameter name='brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.' 
+value="`$brg-ar-identifiers.`" />
 
 
 </set><set>
-<parameter name='sz-ar-assignments.vlan-tag' value="`$brg-topology-operation-input.brg-request-input.vlan-tag` " />
-<parameter name='sz-ar-assignments.trusted-network-role' value="`$brg-topology-operation-input.brg-request-input.trusted-network-role` " />
-<parameter name='sz-ar-assignments.untrusted-network-role' value="`$brg-topology-operation-input.brg-request-input.untrusted-network-role` " />
-<parameter name='sz-ar-assignments.brg-service-instance-id' value="`$tmp.ar.parent-service-instance-id` " />
-
-</set><call module='GENERIC-RESOURCE-API' rpc='generate-panorama-name' mode='sync' >
-</call><set>
-<parameter name='sz-ar-assignments.brg-name-untrusted' value="`$tmp.untrust-sz` " />
-<parameter name='sz-ar-assignments.brg-name-trusted' value="`$tmp.trust-sz` " />
-
-
+<parameter name='brg-ar-assignments.vbrg-wan-ip' value='127.0.0.1'/>
 </set><set>
-<parameter name='sz-ar.allotted-resource-data.brg-topology.brg-assignments.' 
-value="`$sz-ar-assignments.`" />
+<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.' 
+value="`$brg-ar-assignments.`" />
 
 
 </set><switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
@@ -189,8 +139,7 @@ value="`$sz-ar-assignments.`" />
 <block atomic="true"><set>
 <parameter name='tmp.cidx' value='`$cidx`' />
 <parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />
-<parameter name='tmp.found-cidx' value='true' /></set><break>
-</break></block></outcome></switch></for><switch test='`$tmp.found-cidx`'>
+<parameter name='tmp.found-cidx' value='true' /></set><break></break></block></outcome></switch></for><switch test='`$tmp.found-cidx`'>
 <outcome value='false'>
 <block atomic="true"><set>
 <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
@@ -204,19 +153,19 @@ value="`$sz-ar-assignments.`" />
     <parameter name="outputPath" value="tmp.current-time" />
 
 </execute><set>
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
 </set><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="allotted-resource" 
-		key="customer.global-customer-id = $service-data.service-information.global-customer-id AND
-			service-subscription.service-type = $service-data.service-information.subscription-service-type AND
-			service-instance.service-instance-id = $service-data.service-information.service-instance-id AND
+		key="customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $brg-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
 			allotted-resource.id = $tmp.ar.allotted-resource-id"
         pfx='pfx' local-only='false' force='false'>
-	<parameter name="description" value="`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
+	<parameter name="description" value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
 	<parameter name="selflink" value="`$tmp.ar.self-link`" />
 	<parameter name="model-invariant-id" value="`$ar-model.invariant-uuid`" />
 	<parameter name="model-version-id" value="`$ar-model.uuid`" />
@@ -232,7 +181,7 @@ value="`$sz-ar-assignments.`" />
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="AAI failed" />
 </return></outcome></update><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`" />
+    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`" />
     <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
     <parameter name='restapiUser' value='`$prop.controller.user`' />
     <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
@@ -252,24 +201,21 @@ value="`$sz-ar-assignments.`" />
     <parameter name="responsePrefix" value="parent" />
 
 <outcome value='success'>
-<block>
-</block></outcome><outcome value='failure'>
-<block>
-</block></outcome><outcome value='not-found'>
-<block>
-</block></outcome></execute></block></outcome><outcome value='failure'>
+<block></block></outcome><outcome value='failure'>
+<block></block></outcome><outcome value='not-found'>
+<block></block></outcome></execute></block></outcome><outcome value='failure'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+    <parameter name="error-message" value="Error updating md-sal for tunnelxconn-allotted-resource" />
 </return></outcome><outcome value='not-found'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+    <parameter name="error-message" value="Error updating md-sal for tunnelxconn-allotted-resource" />
 </return></outcome></execute><set>
 <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-<parameter name='brg-object-path' value="`$tmp.ar.self-link`"/>
+<parameter name='tunnelxconn-object-path' value="`$tmp.ar.self-link`"/>
 <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
  + $brg-topology-operation-input.service-information.service-instance-id
  + '/service-data/service-topology/'`"/>
@@ -278,4 +224,4 @@ value="`$sz-ar-assignments.`" />
 <parameter name="ack-final-indicator" value="Y" />
 <parameter name="error-code" value="200" />
 <parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file
+</return></block></outcome></get-resource></block></method></service-logic>