Update underlay DG for integration issues

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

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 76a52b5..f4fd9ee 100644 (file)
--- 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>\r
                         </outcome>\r
                     </switch>\r
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`">\r
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'serviceType'`">\r
                         <outcome value="true">\r
                             <set>\r
                                 <parameter name="prop.l3vpn.service-type" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />\r
@@ -152,7 +152,7 @@
                                     <parameter name="prop.l3vpn.ac1_route" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />\r
                                 </set>\r
                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">\r
-                                    <parameter name="original_string" value="`$prop.l3vpn.ac1-route`" />\r
+                                    <parameter name="original_string" value="`$prop.l3vpn.ac1_route`" />\r
                                     <parameter name="regex" value=" ## " />\r
                                     <parameter name="ctx_memory_result_key" value="route1" />\r
                                     <outcome value="success">\r
@@ -178,7 +178,7 @@
                                     <parameter name="prop.l3vpn.ac2_route" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />\r
                                 </set>\r
                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">\r
-                                    <parameter name="original_string" value="`$prop.l3vpn.ac2-route`" />\r
+                                    <parameter name="original_string" value="`$prop.l3vpn.ac2_route`" />\r
                                     <parameter name="regex" value=" ## " />\r
                                     <parameter name="ctx_memory_result_key" value="route2" />\r
                                     <outcome value="success">\r
@@ -276,7 +276,7 @@
                 </outcome>\r
             </execute>\r
             <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID">\r
-                <parameter name="ctx-destination" value="prop.l3vpn.vpn-policy2-id" />\r
+                <parameter name="ctx-destination" value="prop.l3vpn.entry1-id" />\r
                 <outcome value="failure">\r
                     <return status="failure">\r
                         <parameter name="error-code" value="" />\r
@@ -284,10 +284,6 @@
                     </return>\r
                 </outcome>\r
             </execute>\r
-            <set>\r
-                <parameter name="prop.l3vpn.entry1-id" value="1" />\r
-                <parameter name="prop.l3vpn.entry2-id" value="1" />\r
-            </set>\r
             <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID">\r
                 <parameter name="ctx-destination" value="prop.l3vpn.vrf1-id" />\r
                 <outcome value="failure">\r
@@ -342,20 +338,20 @@
                 <parameter name="field17" value="`$prop.l3vpn.pe1_id`" />\r
                 <parameter name="field18" value="`l3vpn.ac1_id`" />\r
                 <parameter name="field19" value="`$prop.l3vpn.ac1_id`" />\r
-                <parameter name="field20" value="`l3vpn.sna1_svlan`" />\r
-                <parameter name="field21" value="`$prop.l3vpn.sna1_svlan`" />\r
-                <parameter name="field22" value="`l3vpn.ac1-peer-ip`" />\r
-                <parameter name="field23" value="`$prop.l3vpn.ac1-peer-ip`" />\r
-                <parameter name="field24" value="`l3vpn.ac1-ip`" />\r
-                <parameter name="field25" value="`$prop.l3vpn.ac1-ip`" />\r
+                <parameter name="field20" value="`l3vpn.ac1_svlan`" />\r
+                <parameter name="field21" value="`$prop.l3vpn.ac1_svlan`" />\r
+                <parameter name="field22" value="`l3vpn.ac1_peer_ip`" />\r
+                <parameter name="field23" value="`$prop.l3vpn.ac1_peer_ip`" />\r
+                <parameter name="field24" value="`l3vpn.ac1_ip`" />\r
+                <parameter name="field25" value="`$prop.l3vpn.ac1_ip`" />\r
                 <parameter name="field26" value="`l3vpn.ac1_protocol`" />\r
                 <parameter name="field27" value="`$prop.l3vpn.ac1_protocol`" />\r
                 <parameter name="field28" value="`l3vpn.sna1-route-ip-prefix`" />\r
                 <parameter name="field29" value="`$prop.l3vpn.sna1-route-ip-prefix`" />\r
                 <parameter name="field30" value="`l3vpn.sna1-route-next-hop`" />\r
                 <parameter name="field31" value="`$prop.l3vpn.sna1-route-next-hop`" />\r
-                <parameter name="field32" value="`l3vpn.peer1-ip`" />\r
-                <parameter name="field33" value="`$prop.l3vpn.peer1-ip`" />\r
+                <parameter name="field32" value="`l3vpn.peer1_ip`" />\r
+                <parameter name="field33" value="`$prop.l3vpn.peer1_ip`" />\r
                 <parameter name="field34" value="`l3vpn.ac1_protocol_bgp_as`" />\r
                 <parameter name="field35" value="`$prop.l3vpn.ac1_protocol_bgp_as`" />\r
                 <parameter name="field36" value="`l3vpn.vrf1-id`" />\r
@@ -372,20 +368,20 @@
                 <parameter name="field47" value="`$prop.l3vpn.pe2_id`" />\r
                 <parameter name="field48" value="`l3vpn.ac2_id`" />\r
                 <parameter name="field49" value="`$prop.l3vpn.ac2_id`" />\r
-                <parameter name="field50" value="`l3vpn.sna2_svlan`" />\r
-                <parameter name="field51" value="`$prop.l3vpn.sna2_svlan`" />\r
-                <parameter name="field52" value="`l3vpn.ac2-peer-ip`" />\r
-                <parameter name="field53" value="`$prop.l3vpn.ac2-peer-ip`" />\r
-                <parameter name="field54" value="`l3vpn.ac2-ip`" />\r
-                <parameter name="field55" value="`$prop.l3vpn.ac2-ip`" />\r
+                <parameter name="field50" value="`l3vpn.ac2_svlan`" />\r
+                <parameter name="field51" value="`$prop.l3vpn.ac2_svlan`" />\r
+                <parameter name="field52" value="`l3vpn.ac2_peer_ip`" />\r
+                <parameter name="field53" value="`$prop.l3vpn.ac2_peer_ip`" />\r
+                <parameter name="field54" value="`l3vpn.ac2_ip`" />\r
+                <parameter name="field55" value="`$prop.l3vpn.ac2_ip`" />\r
                 <parameter name="field56" value="`l3vpn.ac2_protocol`" />\r
                 <parameter name="field57" value="`$prop.l3vpn.ac2_protocol`" />\r
                 <parameter name="field58" value="`l3vpn.sna2-route-ip-prefix`" />\r
                 <parameter name="field59" value="`$prop.l3vpn.sna2-route-ip-prefix`" />\r
                 <parameter name="field60" value="`l3vpn.sna2-route-next-hop`" />\r
                 <parameter name="field61" value="`$prop.l3vpn.sna2-route-next-hop`" />\r
-                <parameter name="field62" value="`l3vpn.peer2-ip`" />\r
-                <parameter name="field63" value="`$prop.l3vpn.peer2-ip`" />\r
+                <parameter name="field62" value="`l3vpn.peer2_ip`" />\r
+                <parameter name="field63" value="`$prop.l3vpn.peer2_ip`" />\r
                 <parameter name="field64" value="`l3vpn.ac2_protocol_bgp_as`" />\r
                 <parameter name="field65" value="`$prop.l3vpn.ac2_protocol_bgp_as`" />\r
                 <parameter name="field66" value="`l3vpn.vrf2-id`" />\r
@@ -406,9 +402,13 @@
                             <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="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.token_id" />\r
+                                    <parameter name="prop.sdncRestApi.token_id" value="`$token-result.data.token_id`" />\r
                                 </set>\r
                             </outcome>\r
                             <outcome value="failure">\r
@@ -427,31 +427,43 @@
                             <parameter name="format" value="json" />\r
                             <parameter name="httpMethod" value="post" />\r
                             <parameter name="responsePrefix" value="vpn-result" />\r
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.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="success" />\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 3rd party controller rest api" />\r
+                                    <parameter name="error-message" value="Error executing Create vpn rest api" />\r
                                 </return>\r
                             </outcome>\r
+                            <outcome value="success">\r
+                                <block atomic="true" />\r
+                            </outcome>\r
                         </execute>\r
                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
                             <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3smvrftemplate.json'`" />\r
-                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes'`" />\r
+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/huawei-ac-net-l3vpn-svc-vfi:vrf-attributes'`" />\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="httpMethod" value="put" />\r
                             <parameter name="responsePrefix" value="vrf-result" />\r
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.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="success" />\r
+                            <outcome value="success">\r
+                                <block atomic="true" />\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 3rd party controller rest api" />\r
+                                    <parameter name="error-message" value="Error executing Create vrf rest api" />\r
                                 </return>\r
                             </outcome>\r
                         </execute>\r
@@ -463,13 +475,19 @@
                             <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="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="success" />\r
+                            <outcome value="success">\r
+                                <block atomic="true" />\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 3rd party controller rest api" />\r
+                                    <parameter name="error-message" value="Error executing Create site rest api" />\r
                                 </return>\r
                             </outcome>\r
                         </execute>\r
@@ -477,11 +495,11 @@
                 </outcome>\r
                 <outcome value="l3vpn-sptn">\r
                     <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
-                        <parameter name="templateFileName" value="$prop.sdncRestApi.templateDir +'/l3smsitetemplate.json'" />\r
-                        <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url" />\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="templateFileName" value="`$prop.restapi.templateDir +'/sptn-l3vpn-template.xml'`" />\r
+                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/sptn-service-l3vpn:service/snc-l3vpns'`" />\r
+                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                        <parameter name="format" value="xml" />\r
                         <parameter name="httpMethod" value="post" />\r
                         <parameter name="responsePrefix" value="restapi-result" />\r
                     </execute>\r
@@ -515,16 +533,17 @@
             <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $prop.l3vpn.network-id">\r
                 <parameter name="configuration-id" value="`$prop.l3vpn.network-id`" />\r
                 <parameter name="configuration-type" value="underlay" />\r
+                <parameter name="configuration-sub-type" value="l3vpn" />\r
                 <parameter name="orchestration-status" value="Created" />\r
+                <parameter name="operational-status" value="Created" />\r
+                <parameter name="model-customization-id" value="`$prop.l3vpn.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.l3vpn.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.l3vpn.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.l3vpn.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="underlay" />\r
             </save>\r
             <return status="success">\r
                 <parameter name="ack-final-indicator" value="Y" />\r