Code Review / sdnc / oam.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
fix AAI storage problem
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
index c0046db..411cbb3 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
@@ -155,6 +155,7 @@
                                     <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
+                                    <parameter name="prop.sdncRestApi.thirdpartySdnc.vendor" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`" />\r
                                 </set>\r
                             </outcome>\r
                             <outcome value="not-found">\r
@@ -187,49 +188,32 @@
                             <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />\r
                             <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />\r
                         </record>\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
-                            <outcome value="success">\r
-                                <set>\r
-                                    <parameter name="prop.sdncRestApi.token_id" value="$token-result.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
-                        <switch test="`$prop.dci-connects.tunnelType`">\r
-                            <outcome value="L3-DCI">\r
-                                <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
-                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3-dci-connects-template.json'`" />\r
-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />\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="restapi-result" />\r
-                                    <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                </execute>\r
-                            </outcome>\r
-                            <outcome value="L2-DCI">\r
-                                <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
-                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l2-dci-connects-template.json'`" />\r
-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />\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="restapi-result" />\r
-                                    <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                </execute>\r
+                        <switch test="`$prop.sdncRestApi.thirdpartySdnc.vendor`">\r
+                            <outcome value="SPTN">\r
+                                <switch test="`$prop.dci-connects.tunnelType`">\r
+                                    <outcome value="L3-DCI">\r
+                                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
+                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3-dci-connects-template.json'`" />\r
+                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />\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="restapi-result" />\r
+                                        </execute>\r
+                                    </outcome>\r
+                                    <outcome value="L2-DCI">\r
+                                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
+                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l2-dci-connects-template.json'`" />\r
+                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />\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="restapi-result" />\r
+                                        </execute>\r
+                                    </outcome>\r
+                                </switch>\r
                             </outcome>\r
                         </switch>\r
                     </block>\r
@@ -376,6 +360,7 @@
                                     <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
+                                    <parameter name="prop.sdncRestApi.thirdpartySdnc.vendor" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`" />\r
                                 </set>\r
                             </outcome>\r
                             <outcome value="not-found">\r
@@ -408,49 +393,32 @@
                             <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />\r
                             <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />\r
                         </record>\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
-                            <outcome value="success">\r
-                                <set>\r
-                                    <parameter name="prop.sdncRestApi.token_id" value="$token-result.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
-                        <switch test="`$prop.dci-connects.tunnelType`">\r
-                            <outcome value="L3-DCI">\r
-                                <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
-                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3-dci-connects-template.json'`" />\r
-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />\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="restapi-result" />\r
-                                    <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                </execute>\r
-                            </outcome>\r
-                            <outcome value="L2-DCI">\r
-                                <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
-                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l2-dci-connects-template.json'`" />\r
-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />\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="restapi-result" />\r
-                                    <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                </execute>\r
+                        <switch test="`$prop.sdncRestApi.thirdpartySdnc.vendor`">\r
+                            <outcome value="SPTN">\r
+                                <switch test="`$prop.dci-connects.tunnelType`">\r
+                                    <outcome value="L3-DCI">\r
+                                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
+                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3-dci-connects-template.json'`" />\r
+                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />\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="restapi-result" />\r
+                                        </execute>\r
+                                    </outcome>\r
+                                    <outcome value="L2-DCI">\r
+                                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
+                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l2-dci-connects-template.json'`" />\r
+                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />\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="restapi-result" />\r
+                                        </execute>\r
+                                    </outcome>\r
+                                </switch>\r
                             </outcome>\r
                         </switch>\r
                     </block>\r
@@ -492,16 +460,17 @@
             <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $prop.dci.network-id">\r
                 <parameter name="configuration-id" value="`$prop.dci.network-id`" />\r
                 <parameter name="configuration-type" value="overlay" />\r
+                <parameter name="configuration-sub-type" value="VPN-DCI" />\r
                 <parameter name="orchestration-status" value="Created" />\r
+                <parameter name="operational-status" value="Created" />\r
+                <parameter name="model-customization-id" value="`$prop.dci.network-id`" />\r
                 <parameter name="configuration-selflink" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.dci.network-id  + '/network-data/'` " />\r
             </save>\r
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" key="service-instance.service-instance-id = $service-data.service-information.service-id">\r
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" key="service-instance.service-instance-id = $service-data.service-information.service-instance-id           AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id           AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type" force="true" pfx="tmp.AnAI-data">\r
                 <parameter name="relationship-list.relationship[0].related-to" value="configuration" />\r
-                <parameter name="relationship-list.relationship[0].related-link" value="/network/configurations/configuration" />\r
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/configurations/configuration/' + $prop.dci.network-id`" />\r
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="configuration.configuration-id" />\r
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.dci.network-id`" />\r
-                <parameter name="relationship-list.relationship[0].relationship-data[1].relationship-key" value="configuration.configuration-type" />\r
-                <parameter name="relationship-list.relationship[0].relationship-data[1].relationship-value" value="overlay" />\r
             </save>\r
             <return status="success">\r
                 <parameter name="ack-final-indicator" value="Y" />\r
SDNC OA&M tools