Code Review / sdnc / oam.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Fixed JAVA keystore file name
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml
index ebe9422..d075c21 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml
@@ -260,7 +260,7 @@
                                                 </set>\r
                                             </outcome>\r
                                         </switch>\r
-                                        <switch test="`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpnId'`">\r
+                                        <switch test="`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`">\r
                                             <outcome value='true'>\r
                                                 <set>\r
                                                     <parameter name='prop.vpnId' value='`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\r
@@ -352,9 +352,33 @@
                                                                     <block atomic="true">\r
                                                                         <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSDWANPortInstance'`">\r
                                                                             <outcome value='true'>\r
-                                                                                <set>\r
-                                                                                    <parameter name='tmp.portvidx' value='`$arvidx`' />\r
-                                                                                </set>\r
+                                                                                <block atomic="true">\r
+                                                                                    <set>\r
+                                                                                        <parameter name='tmp.portvidx' value='`$arvidx`' />\r
+                                                                                    </set>\r
+                                                                                    <for index="wportidx" start="0" end="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`">\r
+                                                                                        <block atomic="true">\r
+                                                                                            <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'transportNetworkName'`">\r
+                                                                                                <outcome value='true'>\r
+                                                                                                    <block atomic="true">\r
+                                                                                                        <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value == $prop.spoke.transportNetworkName`">\r
+                                                                                                            <outcome value='true'>\r
+                                                                                                                <block atomic="true">\r
+                                                                                                                    <set>\r
+                                                                                                                        <parameter name='tmp.wanportvidx' value='`$arvidx`' />\r
+                                                                                                                    </set>\r
+                                                                                                                    <set>\r
+                                                                                                                        <parameter name='prop.hub.transportNetworkName' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\r
+                                                                                                                    </set>\r
+                                                                                                                </block>\r
+                                                                                                            </outcome>\r
+                                                                                                        </switch>\r
+                                                                                                    </block>\r
+                                                                                                </outcome>\r
+                                                                                            </switch>\r
+                                                                                        </block>\r
+                                                                                    </for>\r
+                                                                                </block>\r
                                                                             </outcome>\r
                                                                         </switch>\r
                                                                         <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`">\r
@@ -374,7 +398,7 @@
                                                                     </block>\r
                                                                 </for>\r
                                                                 <block atomic="true">\r
-                                                                    <switch test="`$tmp.portvidx`">\r
+                                                                    <switch test="`$tmp.wanportvidx`">\r
                                                                         <outcome value=''>\r
                                                                             <return status='failure'>\r
                                                                                 <parameter name='ack-final' value='Y'/>\r
@@ -402,44 +426,37 @@
                                                                         </outcome>\r
                                                                     </switch>\r
                                                                 </block>\r
-                                                                <for index="wportidx" start="0" end="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`">\r
-                                                                    <block atomic="true">\r
-                                                                        <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'transportNetworkName'`">\r
-                                                                            <outcome value='true'>\r
-                                                                                <set>\r
-                                                                                    <parameter name='prop.hub.transportNetworkName' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\r
-                                                                                </set>\r
-                                                                            </outcome>\r
-                                                                        </switch>\r
-                                                                        <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'wanPortId'`">\r
-                                                                            <outcome value='true'>\r
-                                                                                <set>\r
-                                                                                    <parameter name='prop.hub.wanPortId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\r
-                                                                                </set>\r
-                                                                            </outcome>\r
-                                                                        </switch>\r
-                                                                        <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'providerIpAddress'`">\r
-                                                                            <outcome value='true'>\r
-                                                                                <set>\r
-                                                                                    <parameter name='prop.hub.providerIpAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\r
-                                                                                </set>\r
-                                                                            </outcome>\r
-                                                                        </switch>\r
-                                                                        <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'ipAddress'`">\r
-                                                                            <outcome value='true'>\r
-                                                                                <set>\r
-                                                                                    <parameter name='prop.hub.ipAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\r
-                                                                                </set>\r
-                                                                            </outcome>\r
-                                                                        </switch>\r
-                                                                    </block>\r
-                                                                </for>\r
                                                                 <switch test="`$prop.hub.transportNetworkName == $prop.spoke.transportNetworkName`">\r
                                                                     <outcome value='false'>\r
                                                                         <block></block>\r
                                                                     </outcome>\r
                                                                     <outcome value='true'>\r
                                                                         <block atomic="true">\r
+                                                                            <for index="wportidx" start="0" end="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`">\r
+                                                                                <block atomic="true">\r
+                                                                                    <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'wanPortId'`">\r
+                                                                                        <outcome value='true'>\r
+                                                                                            <set>\r
+                                                                                                <parameter name='prop.hub.wanPortId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\r
+                                                                                            </set>\r
+                                                                                        </outcome>\r
+                                                                                    </switch>\r
+                                                                                    <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'providerIpAddress'`">\r
+                                                                                        <outcome value='true'>\r
+                                                                                            <set>\r
+                                                                                                <parameter name='prop.hub.providerIpAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\r
+                                                                                            </set>\r
+                                                                                        </outcome>\r
+                                                                                    </switch>\r
+                                                                                    <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'ipAddress'`">\r
+                                                                                        <outcome value='true'>\r
+                                                                                            <set>\r
+                                                                                                <parameter name='prop.hub.ipAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\r
+                                                                                            </set>\r
+                                                                                        </outcome>\r
+                                                                                    </switch>\r
+                                                                                </block>\r
+                                                                            </for>\r
                                                                             <set>\r
                                                                                 <parameter name='prop.hubTnpId' value='$prop.hub.wanPortId' />\r
                                                                             </set>\r
@@ -475,6 +492,10 @@
                                                                             <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\r
                                                                                 <outcome value='ActivateSDWANAttachmentInstance'>\r
                                                                                     <block atomic="true">\r
+                                                                                        <set>\r
+                                                                                            <parameter name='prop.hub.ipAddress' value="10.2.0.2" />\r
+                                                                                            <parameter name='prop.hub.providerIpAddress' value="10.2.0.0/16" />\r
+                                                                                        </set>\r
                                                                                         <set>\r
                                                                                             <parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\r
                                                                                             <parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />\r
@@ -491,20 +512,22 @@
                                                                                             <parameter name="format" value="json"/>\r
                                                                                             <parameter name="httpMethod" value="post"/>\r
                                                                                             <parameter name="responsePrefix" value="underlayHubResp"/>\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
                                                                                             <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
                                                                                             <outcome value='failure'>\r
-                                                                                                <return status='failure'>\r
-                                                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                                                    <parameter name="error-code" value="500" />\r
-                                                                                                    <parameter name="error-message" value="Error executing sdwan hub route underlay rest api" />\r
-                                                                                                </return>\r
+                                                                                                <block></block>\r
+                                                                                            </outcome>\r
+                                                                                            <outcome value='success'>\r
+                                                                                                <block></block>\r
                                                                                             </outcome>\r
-                                                                                            <outcome value='success'></outcome>\r
                                                                                         </execute>\r
+                                                                                        <set>\r
+                                                                                            <parameter name='prop.spoke.ipAddress' value="10.3.0.1" />\r
+                                                                                            <parameter name='prop.spoke.providerIpAddress' value="10.3.0.0/16" />\r
+                                                                                        </set>\r
                                                                                         <set>\r
                                                                                             <parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\r
                                                                                             <parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />\r
@@ -521,19 +544,17 @@
                                                                                             <parameter name="format" value="json"/>\r
                                                                                             <parameter name="httpMethod" value="post"/>\r
                                                                                             <parameter name="responsePrefix" value="underlayspokeResp"/>\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
                                                                                             <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
                                                                                             <outcome value='failure'>\r
-                                                                                                <return status='failure'>\r
-                                                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                                                    <parameter name="error-code" value="500" />\r
-                                                                                                    <parameter name="error-message" value="Error executing sdwan spoke route underlay rest api" />\r
-                                                                                                </return>\r
+                                                                                                <block></block>\r
+                                                                                            </outcome>\r
+                                                                                            <outcome value='success'>\r
+                                                                                                <block></block>\r
                                                                                             </outcome>\r
-                                                                                            <outcome value='success'></outcome>\r
                                                                                         </execute>\r
                                                                                         <set>\r
                                                                                             <parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubSiteId' value='`$prop.hub.siteId`' />\r
@@ -571,6 +592,10 @@
                                                                                                 </switch>\r
                                                                                             </block>\r
                                                                                         </for>\r
+                                                                                        <set>\r
+                                                                                            <parameter name='prop.hub.ipAddress' value="10.2.0.2" />\r
+                                                                                            <parameter name='prop.hub.providerIpAddress' value="10.2.0.0/16" />\r
+                                                                                        </set>\r
                                                                                         <set>\r
                                                                                             <parameter name='prop.route.id' value='`$prop.hubRouteId`' />\r
                                                                                             <parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\r
@@ -588,20 +613,22 @@
                                                                                             <parameter name="format" value="json"/>\r
                                                                                             <parameter name="httpMethod" value="post"/>\r
                                                                                             <parameter name="responsePrefix" value="underlayHubResp"/>\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
                                                                                             <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
                                                                                             <outcome value='failure'>\r
-                                                                                                <return status='failure'>\r
-                                                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                                                    <parameter name="error-code" value="500" />\r
-                                                                                                    <parameter name="error-message" value="Error executing sdwan hub route underlay rest api" />\r
-                                                                                                </return>\r
+                                                                                                <block></block>\r
+                                                                                            </outcome>\r
+                                                                                            <outcome value='success'>\r
+                                                                                                <block></block>\r
                                                                                             </outcome>\r
-                                                                                            <outcome value='success'></outcome>\r
                                                                                         </execute>\r
+                                                                                        <set>\r
+                                                                                            <parameter name='prop.spoke.ipAddress' value="10.3.0.1" />\r
+                                                                                            <parameter name='prop.spoke.providerIpAddress' value="10.3.0.0/16" />\r
+                                                                                        </set>\r
                                                                                         <set>\r
                                                                                             <parameter name='prop.route.id' value='`$prop.spokeRouteId`' />\r
                                                                                             <parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\r
@@ -619,19 +646,17 @@
                                                                                             <parameter name="format" value="json"/>\r
                                                                                             <parameter name="httpMethod" value="post"/>\r
                                                                                             <parameter name="responsePrefix" value="underlayspokeResp"/>\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
                                                                                             <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
                                                                                             <outcome value='failure'>\r
-                                                                                                <return status='failure'>\r
-                                                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                                                    <parameter name="error-code" value="500" />\r
-                                                                                                    <parameter name="error-message" value="Error executing sdwan spoke route underlay rest api" />\r
-                                                                                                </return>\r
+                                                                                                <block></block>\r
+                                                                                            </outcome>\r
+                                                                                            <outcome value='success'>\r
+                                                                                                <block></block>\r
                                                                                             </outcome>\r
-                                                                                            <outcome value='success'></outcome>\r
                                                                                         </execute>\r
                                                                                     </block>\r
                                                                                 </outcome>\r
@@ -726,7 +751,7 @@
                         <parameter name="format" value="json"/>\r
                         <parameter name="httpMethod" value="post"/>\r
                         <parameter name="responsePrefix" value="provisionUrlRsp"/>\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
SDNC OA&M tools