X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_network-topology-operation-create.xml;h=d7ee6d01610744ac015eb29964882dd03b6d7722;hb=4967a3857863b2a31a3c012bf51c2ba705b7c518;hp=0753281ee70038b37f533a23a1d817d4c25ed91a;hpb=283621bcb52205e44bf830adba0a985ddd63ca64;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
index 0753281e..d7ee6d01 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
@@ -12,7 +12,7 @@
                             </set>
                         </outcome>
                     </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`">
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'serviceType'`">
                         <outcome value="true">
                             <set>
                                 <parameter name="prop.l3vpn.service-type" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
@@ -232,14 +232,14 @@
                     <return status="failure">
                         <parameter name="ack-final" value="Y" />
                         <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
                     </return>
                 </outcome>
                 <outcome value="Other">
                     <return status="failure">
                         <parameter name="ack-final" value="Y" />
                         <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
                     </return>
                 </outcome>
             </get-resource>
@@ -247,7 +247,6 @@
                 <outcome value="success">
                     <set>
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                        <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
                     </set>
@@ -324,78 +323,161 @@
             </switch>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                 <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log" />
-                <parameter name="Time" value="__TIMESTAMP__" />
-                <parameter name="Method" value="network-topology-operation-create" />
-                <parameter name="SubMethod" value="L3VPN-Config" />
-                <parameter name="l3vpn_name" value="`$prop.l3vpn.name`" />
-                <parameter name="topology" value="`$prop.l3vpn.topology`" />
-                <parameter name="site1_name" value="`$prop.l3vpn.site1_name`" />
-                <parameter name="vpn-policy1-id" value="`$prop.l3vpn.vpn-policy1-id`" />
-                <parameter name="l3vpn.entry1-id" value="`$prop.l3vpn.entry1-id`" />
-                <parameter name="sna1_name" value="`$prop.l3vpn.sna1_name`" />
-                <parameter name="pe1_id" value="`$prop.l3vpn.pe1_id`" />
-                <parameter name="ac1_id" value="`$prop.l3vpn.ac1_id`" />
-                <parameter name="sna1_svlan" value="`$prop.l3vpn.sna1_svlan`" />
-                <parameter name="ac1-peer-ip" value="`$prop.l3vpn.ac1-peer-ip`" />
-                <parameter name="ac1-ip" value="`$prop.l3vpn.ac1-ip`" />
-                <parameter name="ac1_protocol" value="`$prop.l3vpn.ac1_protocol`" />
-                <parameter name="sna1-route-ip-prefix" value="`$prop.l3vpn.sna1-route-ip-prefix`" />
-                <parameter name="sna1-route-next-hop" value="`$prop.l3vpn.sna1-route-next-hop`" />
-                <parameter name="peer1-ip" value="`$prop.l3vpn.peer1-ip`" />
-                <parameter name="ac1_protocol_bgp_as" value="`$prop.l3vpn.ac1_protocol_bgp_as`" />
-                <parameter name="vrf1-id" value="`$prop.l3vpn.vrf1-id`" />
-                <parameter name="site2_name" value="`$prop.l3vpn.site2_name`" />
-                <parameter name="vpn-policy2-id" value="`$prop.l3vpn.vpn-policy2-id`" />
-                <parameter name="l3vpn.entry2-id" value="`$prop.l3vpn.entry2-id`" />
-                <parameter name="sna2_name" value="`$prop.l3vpn.sna2_name`" />
-                <parameter name="pe2_id" value="`$prop.l3vpn.pe2_id`" />
-                <parameter name="ac2_id" value="`$prop.l3vpn.ac2_id`" />
-                <parameter name="sna2_svlan" value="`$prop.l3vpn.sna2_svlan`" />
-                <parameter name="ac2-peer-ip" value="`$prop.l3vpn.ac2-peer-ip`" />
-                <parameter name="ac2-ip" value="`$prop.l3vpn.ac2-ip`" />
-                <parameter name="ac2_protocol" value="`$prop.l3vpn.ac2_protocol`" />
-                <parameter name="sna2-route-ip-prefix" value="`$prop.l3vpn.sna2-route-ip-prefix`" />
-                <parameter name="sna2-route-next-hop" value="`$prop.l3vpn.sna2-route-next-hop`" />
-                <parameter name="peer2-ip" value="`$prop.l3vpn.peer2-ip`" />
-                <parameter name="ac2_protocol_bgp_as" value="`$prop.l3vpn.ac2_protocol_bgp_as`" />
-                <parameter name="vrf2-id" value="`$prop.l3vpn.vrf2-id`" />
-                <parameter name="af_type" value="`$prop.l3vpn.af_type`" />
+                <parameter name="field1" value="__TIMESTAMP__" />
+                <parameter name="field2" value="network-topology-operation-create" />
+                <parameter name="field3" value="L3VPN-Config" />
+                <parameter name="field4" value="`l3vpn.name`" />
+                <parameter name="field5" value="`$prop.l3vpn.name`" />
+                <parameter name="field6" value="`l3vpn.topology`" />
+                <parameter name="field7" value="`$prop.l3vpn.topology`" />
+                <parameter name="field8" value="`l3vpn.site1_name`" />
+                <parameter name="field9" value="`$prop.l3vpn.site1_name`" />
+                <parameter name="field10" value="`l3vpn.vpn-policy1-id`" />
+                <parameter name="field11" value="`$prop.l3vpn.vpn-policy1-id`" />
+                <parameter name="field12" value="`l3vpn.entry1-id`" />
+                <parameter name="field13" value="`$prop.l3vpn.entry1-id`" />
+                <parameter name="field14" value="`l3vpn.sna1_name`" />
+                <parameter name="field15" value="`$prop.l3vpn.sna1_name`" />
+                <parameter name="field16" value="`l3vpn.pe1_id`" />
+                <parameter name="field17" value="`$prop.l3vpn.pe1_id`" />
+                <parameter name="field18" value="`l3vpn.ac1_id`" />
+                <parameter name="field19" value="`$prop.l3vpn.ac1_id`" />
+                <parameter name="field20" value="`l3vpn.sna1_svlan`" />
+                <parameter name="field21" value="`$prop.l3vpn.sna1_svlan`" />
+                <parameter name="field22" value="`l3vpn.ac1-peer-ip`" />
+                <parameter name="field23" value="`$prop.l3vpn.ac1-peer-ip`" />
+                <parameter name="field24" value="`l3vpn.ac1-ip`" />
+                <parameter name="field25" value="`$prop.l3vpn.ac1-ip`" />
+                <parameter name="field26" value="`l3vpn.ac1_protocol`" />
+                <parameter name="field27" value="`$prop.l3vpn.ac1_protocol`" />
+                <parameter name="field28" value="`l3vpn.sna1-route-ip-prefix`" />
+                <parameter name="field29" value="`$prop.l3vpn.sna1-route-ip-prefix`" />
+                <parameter name="field30" value="`l3vpn.sna1-route-next-hop`" />
+                <parameter name="field31" value="`$prop.l3vpn.sna1-route-next-hop`" />
+                <parameter name="field32" value="`l3vpn.peer1-ip`" />
+                <parameter name="field33" value="`$prop.l3vpn.peer1-ip`" />
+                <parameter name="field34" value="`l3vpn.ac1_protocol_bgp_as`" />
+                <parameter name="field35" value="`$prop.l3vpn.ac1_protocol_bgp_as`" />
+                <parameter name="field36" value="`l3vpn.vrf1-id`" />
+                <parameter name="field37" value="`$prop.l3vpn.vrf1-id`" />
+                <parameter name="field38" value="`l3vpn.site2_name`" />
+                <parameter name="field39" value="`$prop.l3vpn.site2_name`" />
+                <parameter name="field40" value="`l3vpn.vpn-policy2-id`" />
+                <parameter name="field41" value="`$prop.l3vpn.vpn-policy2-id`" />
+                <parameter name="field42" value="`l3vpn.entry2-id`" />
+                <parameter name="field43" value="`$prop.l3vpn.entry2-id`" />
+                <parameter name="field44" value="`l3vpn.sna2_name`" />
+                <parameter name="field45" value="`$prop.l3vpn.sna2_name`" />
+                <parameter name="field46" value="`l3vpn.pe2_id`" />
+                <parameter name="field47" value="`$prop.l3vpn.pe2_id`" />
+                <parameter name="field48" value="`l3vpn.ac2_id`" />
+                <parameter name="field49" value="`$prop.l3vpn.ac2_id`" />
+                <parameter name="field50" value="`l3vpn.sna2_svlan`" />
+                <parameter name="field51" value="`$prop.l3vpn.sna2_svlan`" />
+                <parameter name="field52" value="`l3vpn.ac2-peer-ip`" />
+                <parameter name="field53" value="`$prop.l3vpn.ac2-peer-ip`" />
+                <parameter name="field54" value="`l3vpn.ac2-ip`" />
+                <parameter name="field55" value="`$prop.l3vpn.ac2-ip`" />
+                <parameter name="field56" value="`l3vpn.ac2_protocol`" />
+                <parameter name="field57" value="`$prop.l3vpn.ac2_protocol`" />
+                <parameter name="field58" value="`l3vpn.sna2-route-ip-prefix`" />
+                <parameter name="field59" value="`$prop.l3vpn.sna2-route-ip-prefix`" />
+                <parameter name="field60" value="`l3vpn.sna2-route-next-hop`" />
+                <parameter name="field61" value="`$prop.l3vpn.sna2-route-next-hop`" />
+                <parameter name="field62" value="`l3vpn.peer2-ip`" />
+                <parameter name="field63" value="`$prop.l3vpn.peer2-ip`" />
+                <parameter name="field64" value="`l3vpn.ac2_protocol_bgp_as`" />
+                <parameter name="field65" value="`$prop.l3vpn.ac2_protocol_bgp_as`" />
+                <parameter name="field66" value="`l3vpn.vrf2-id`" />
+                <parameter name="field67" value="`$prop.l3vpn.vrf2-id`" />
+                <parameter name="field68" value="`l3vpn.af_type`" />
+                <parameter name="field69" value="`$prop.l3vpn.af_type`" />
             </record>
-            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`">
+            <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties">
+                <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties" />
+                <parameter name="contextPrefix" value="prop" />
+            </execute>
+            <switch test="`$prop.l3vpn.service-type`">
                 <outcome value="l3vpn-ipwan">
                     <block atomic="true">
                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir + '/l3smvpntemplate.json'`" />
+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
+                            <parameter name="format" value="json" />
+                            <parameter name="httpMethod" value="post" />
+                            <parameter name="responsePrefix" value="token-result" />
+                            <outcome value="success">
+                                <set>
+                                    <parameter name="prop.sdncRestApi.token_id" value="$token-result.token_id" />
+                                </set>
+                            </outcome>
+                            <outcome value="failure">
+                                <return status="failure">
+                                    <parameter name="ack-final" value="Y" />
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error executing get token rest api" />
+                                </return>
+                            </outcome>
+                        </execute>
+                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/l3smvpntemplate.json'`" />
                             <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'`" />
                             <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                             <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                             <parameter name="format" value="json" />
                             <parameter name="httpMethod" value="post" />
-                            <parameter name="responsePrefix" value="restapi-result" />
+                            <parameter name="responsePrefix" value="vpn-result" />
+                            <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                            <outcome value="success" />
+                            <outcome value="failure">
+                                <return status="failure">
+                                    <parameter name="ack-final" value="Y" />
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error executing 3rd party controller rest api" />
+                                </return>
+                            </outcome>
                         </execute>
                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3smsitetemplate.json'`" />
-                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites'`" />
+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3smvrftemplate.json'`" />
+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes'`" />
                             <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                             <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                             <parameter name="format" value="json" />
                             <parameter name="httpMethod" value="post" />
-                            <parameter name="responsePrefix" value="restapi-result" />
+                            <parameter name="responsePrefix" value="vrf-result" />
+                            <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                            <outcome value="success" />
+                            <outcome value="failure">
+                                <return status="failure">
+                                    <parameter name="ack-final" value="Y" />
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error executing 3rd party controller rest api" />
+                                </return>
+                            </outcome>
                         </execute>
                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3smvrftemplate.json'`" />
-                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes'`" />
+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3smsitetemplate.json'`" />
+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites'`" />
                             <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                             <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                             <parameter name="format" value="json" />
                             <parameter name="httpMethod" value="post" />
-                            <parameter name="responsePrefix" value="restapi-result" />
+                            <parameter name="responsePrefix" value="site-result" />
+                            <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                            <outcome value="success" />
+                            <outcome value="failure">
+                                <return status="failure">
+                                    <parameter name="ack-final" value="Y" />
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error executing 3rd party controller rest api" />
+                                </return>
+                            </outcome>
                         </execute>
                     </block>
                 </outcome>
-                <outcome value="true">
+                <outcome value="l3vpn-sptn">
                     <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                        <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l3smsitetemplate.json'" />
+                        <parameter name="templateFileName" value="$prop.restapi.templateDir +'/sptn-l3vpn-template.json'" />
                         <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url" />
                         <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
                         <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
@@ -433,16 +515,17 @@
             <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $prop.l3vpn.network-id">
                 <parameter name="configuration-id" value="`$prop.l3vpn.network-id`" />
                 <parameter name="configuration-type" value="underlay" />
+                <parameter name="configuration-sub-type" value="l3vpn" />
                 <parameter name="orchestration-status" value="Created" />
+                <parameter name="operational-status" value="Created" />
+                <parameter name="model-customization-id" value="`$prop.l3vpn.network-id`" />
                 <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.l3vpn.network-id  + '/network-data/'` " />
             </save>
-            <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">
+            <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">
                 <parameter name="relationship-list.relationship[0].related-to" value="configuration" />
-                <parameter name="relationship-list.relationship[0].related-link" value="/network/configurations/configuration" />
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/configurations/configuration/' + $prop.l3vpn.network-id`" />
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="configuration.configuration-id" />
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.l3vpn.network-id`" />
-                <parameter name="relationship-list.relationship[0].relationship-data[1].relationship-key" value="configuration.configuration-type" />
-                <parameter name="relationship-list.relationship[0].relationship-data[1].relationship-value" value="underlay" />
             </save>
             <return status="success">
                 <parameter name="ack-final-indicator" value="Y" />