Fixed JAVA keystore file name

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
index 90ce0e8..4c0e09f 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
@@ -81,27 +81,43 @@
             <switch test="`$prop.site.sdwan`">\r
                 <outcome value='true'>\r
                     <block atomic="true">\r
-                        <for index='cpidx' start='0' end='`$prop.site.controlpoints_length`' >\r
-                            <block atomic="true">\r
-                                <set>\r
-                                    <parameter name='prop.controlPtId' value='`$prop.site.controlpoints[$cpidx]`' />\r
-                                </set>\r
-                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+                        <switch test="`$prop.site.controlPoint`">\r
+                            <outcome value=''>\r
+                                <block>\r
+                                    <set>\r
+                                        <parameter name='template.site.role' value="hub" />\r
+                                    </set>\r
+                                </block>\r
+                            </outcome>\r
+                            <outcome value='Other'>\r
+                                <block atomic="true">\r
+                                    <set>\r
+                                        <parameter name='template.site.role' value="spoke" />\r
+                                    </set>\r
+                                    <for index='cpidx' start='0' end='`$prop.site.controlpoints_length`' >\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name='prop.controlPtId' value='`$prop.site.controlpoints[$cpidx]`' />\r
+                                            </set>\r
+                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="site-resource" \r
-               key="site-resource.name = $prop.controlPtId AND \r
+               key="site-resource.site-resource-name = $prop.controlPtId AND \r
                     depth = '1'"\r
         pfx='tmp.aai.controlPoints' local-only='false' >\r
-                                    <outcome value='success'>\r
-                                        <set>\r
-                                            <parameter name='prop.site.controlpoints[$cpidx]' value='`$tmp.aai.controlPoints.generated-site-id`' />\r
-                                        </set>\r
-                                    </outcome>\r
-                                    <outcome value='failure'>\r
-                                        <block></block>\r
-                                    </outcome>\r
-                                </get-resource>\r
-                            </block>\r
-                        </for>\r
+                                                <outcome value='success'>\r
+                                                    <set>\r
+                                                        <parameter name='prop.site.controlpoints[$cpidx]' value='`$tmp.aai.controlPoints.generated-site-id`' />\r
+                                                    </set>\r
+                                                </outcome>\r
+                                                <outcome value='failure'>\r
+                                                    <block></block>\r
+                                                </outcome>\r
+                                            </get-resource>\r
+                                        </block>\r
+                                    </for>\r
+                                </block>\r
+                            </outcome>\r
+                        </switch>\r
                         <set>\r
                             <parameter name='prop.site.siteId' value="" />\r
                         </set>\r
@@ -138,7 +154,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
@@ -151,15 +167,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-site.json'`" />\r
+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-site-' + $template.site.role + '.json'`" />\r
                             <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/sites'`" />\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="post"/>\r
                             <parameter name="responsePrefix" value="site-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
@@ -199,12 +216,12 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\r
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\r
             </set>\r
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \r
-      key='site-resource.id = $vnf-topology-operation-input.vnf-information.vnf-id' >\r
-                <parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
+            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \r
+      key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\r
+                <parameter name='site-resource-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
                 <parameter name='generated-site-id' value='`$site-result.success[0].id`' />\r
                 <parameter name='operational-status' value='Active' />\r
-            </save>\r
+            </update>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r
                 <parameter name="error-code" value="200" />\r