Fix brg-topo DGs

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_brg-topology-operation-assign.xml

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 d89e2d9..fdd868d 100644 (file)
--- 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
@@ -18,7 +18,7 @@
                 <parameter name="target" value="{allotted-resource-id}"/>\r
                 <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>\r
             </execute>\r
-            <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.alloted-resource-information.allotted-resource-id' pfx='mdsal-ar' >\r
+            <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' >\r
                 <outcome value='success'>\r
                     <return status='failure'>\r
                         <parameter name='ack-final' value='Y'/>\r
@@ -202,10 +202,7 @@
                         </set>\r
                         <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
                                 resource="allotted-resource"\r
-                                key="customer.global-customer-id = $service-data.service-information.global-customer-id AND\r
-                       service-subscription.service-type = $service-data.service-information.subscription-service-type AND\r
-                       service-instance.service-instance-id = $service-data.service-information.service-instance-id AND\r
-                       allotted-resource.id = $tmp.ar.allotted-resource-id"\r
+                                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.service-information.service-instance-id AND allotted-resource.id = $tmp.ar.allotted-resource-id"\r
                                 pfx='pfx' local-only='false' force='false'>\r
                             <parameter name="description" value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`" />\r
                             <parameter name="selflink" value="`$tmp.ar.self-link`" />\r