Fixed JAVA keystore file name

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml
index 1f17ef4..54bae83 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml
@@ -74,7 +74,7 @@
                 <parameter name="format" value="json"/>\r
                 <parameter name="httpMethod" value="post"/>\r
                 <parameter name="responsePrefix" value="token-result"/>\r
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>\r
+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
                 <parameter name="trustStorePassword" value="adminadmin"/>\r
                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
                 <parameter name="keyStorePassword" value="adminadmin"/>\r
@@ -87,15 +87,16 @@
                     <block></block>\r
                 </outcome>\r
             </execute>\r
+            <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-device.json'`" />\r
                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v3/devices'`" />\r
                 <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                 <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
                 <parameter name="format" value="json"/>\r
-                <parameter name="httpMethod" value="put"/>\r
+                <parameter name="httpMethod" value="post"/>\r
                 <parameter name="responsePrefix" value="deviceResp"/>\r
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>\r
+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
                 <parameter name="trustStorePassword" value="adminadmin"/>\r
                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
                 <parameter name="keyStorePassword" value="adminadmin"/>\r
@@ -132,22 +133,12 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='`$vnf-topology-operation-input.service-information.`' />\r
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-information.' value='`$vnf-topology-operation-input.vnf-information.`' />\r
             </set>\r
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \r
+            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \r
       key='device.device-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\r
                 <parameter name='device-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
                 <!--parameter name='device-id' value='`$deviceResp.success[0].id`' /-->\r
                 <parameter name='operational-status' value='Active' />\r
-            </save>\r
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \r
-      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \r
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \r
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \r
-      force="true" pfx="tmp.AnAI-data">\r
-                <parameter name="relationship-list.relationship[0].related-to" value="device" />\r
-                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/devices/device/' + $vnf-topology-operation-input.vnf-information.vnf-id`" />\r
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="device.id" />\r
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />\r
-            </save>\r
+            </update>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r
                 <parameter name="error-code" value="200" />\r