Code Review / sdnc / oam.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
NNI-based Service creation DG bug fixes (uni, l2vpn, and underlay resources).
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / sotn_nni / GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
index ec76dae..406f52c 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
@@ -61,7 +61,6 @@
                                         <set>\r
                                             <parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\r
                                         </set>\r
-                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>\r
                                     </block>\r
                                 </outcome>\r
                             </switch>\r
@@ -71,17 +70,18 @@
             </switch>\r
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="generic-vnf" \r
-               key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \r
-               AND depth = '0'"\r
+               key="generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id"\r
         pfx='tmp.aai.generic-vnf' local-only='false' >\r
+                <!--AND depth = '0'"-->\r
                 <outcome value='success'>\r
                     <block>\r
                         <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >\r
-                            <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\r
+                            <switch test='`$tmp.aai.generic-vnf.relationship-list.relationship[$vidx].related-to`'>\r
                                 <outcome value='uni'>\r
                                     <block atomic="true">\r
                                         <set>\r
-                                            <parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />\r
+                                            <!--<parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />-->\r
+                                            <parameter name='tmp.tpId' value="`$tmp.aai.uni.tpId`" />\r
                                         </set>\r
                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
                                             <parameter name="original_string" value='`tmp.unis.uni[$vidx].tpId`'/>\r
@@ -168,61 +168,30 @@
                 </outcome>\r
             </get-resource>\r
             <call module='GENERIC-RESOURCE-API' rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync' ></call>\r
+            <set>\r
+                <parameter name='tmp.unis.uni[0].id' value="`$vf-module-topology-operation-input.vf-module-information.vf-module-id`" />\r
+                <parameter name='tmp.unis.uni[0].tp-id' value="networkId-providerId-5555-clientId-6666-topologyId-11-nodeId-0.190.0.1" />\r
+                <parameter name='tmp.unis.uni[0].access-provider-id' value="`$domain-A.provider-id`" />\r
+                <parameter name='tmp.unis.uni[0].access-client-id' value="`$domain-A.client-id`" />\r
+                <parameter name='tmp.unis.uni[0].access-topology-id' value="`$domain-A.topology-id`" />\r
+                <parameter name='tmp.unis.uni[0].access-node-id' value="" />\r
+                <parameter name='tmp.unis.uni[0].src-access-ltp-id' value="" />\r
+                <parameter name='tmp.unis.uni[0].dst-access-ltp-id' value="" />\r
+                <parameter name='tmp.unis.uni[1].id' value="5642e9dd-496c-4ef6-be97-5caf4e9beec9" />\r
+                <parameter name='tmp.unis.uni[1].tp-id' value="networkId-domain2-providerId-5555-clientId-6666-topologyId-11-nodeId-0.191.0.4" />\r
+                <parameter name='tmp.unis.uni[1].access-provider-id' value="`$domain-B.provider-id`" />\r
+                <parameter name='tmp.unis.uni[1].access-client-id' value="`$domain-B.client-id`" />\r
+                <parameter name='tmp.unis.uni[1].access-topology-id' value="`$domain-B.topology-id`" />\r
+                <parameter name='tmp.unis.uni[1].access-node-id' value="" />\r
+                <parameter name='tmp.unis.uni[1].src-access-ltp-id' value="" />\r
+                <parameter name='tmp.unis.uni[1].dst-access-ltp-id' value="" />\r
+                <parameter name='tmp.unis.uni_length' value="2" />\r
+            </set>\r
             <for index='vidx' start='0' end='`$tmp.unis.uni_length`' >\r
                 <block atomic="true">\r
                     <set>\r
                         <parameter name='oof.vpn.' value='`$tmp.unis.uni[$vidx].`' />\r
                     </set>\r
-                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="esr-thirdparty-sdnc" \r
-               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $oof.vpn.thirdparty-sdnc-id AND \r
-                    depth = '1'"\r
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\r
-                        <outcome value='success'>\r
-                            <set>\r
-                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
-                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
-                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
-                            </set>\r
-                        </outcome>\r
-                        <outcome value='not-found'>\r
-                            <return status='failure'>\r
-                                <parameter name='ack-final' value='Y'/>\r
-                                <parameter name="error-code" value="500" />\r
-                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />\r
-                            </return>\r
-                        </outcome>\r
-                        <outcome value='Other'>\r
-                            <return status='failure'>\r
-                                <parameter name='ack-final' value='Y'/>\r
-                                <parameter name="error-code" value="500" />\r
-                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />\r
-                            </return>\r
-                        </outcome>\r
-                    </get-resource>\r
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />\r
-                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />\r
-                        <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.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
-                        <outcome value='success'>\r
-                            <set>\r
-                                <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\r
-                            </set>\r
-                        </outcome>\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 get token rest api" />\r
-                            </return>\r
-                        </outcome>\r
-                    </execute>\r
                     <call module='GENERIC-RESOURCE-API' rpc='sotn-create-otn-tunnel' mode='sync' ></call>\r
                     <set>\r
                         <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />\r
SDNC OA&M tools