Merge "Update underlay DG for integration issues"

Former-commit-id: aa55a34ef42aee8472221a948a295d97779dc89c

1 files changed, 55 insertions, 37 deletions

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 d7ee6d01..f4fd9eef 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
@@ -152,7 +152,7 @@
                                     <parameter name="prop.l3vpn.ac1_route" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

                                 </set>

                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">

-                                    <parameter name="original_string" value="`$prop.l3vpn.ac1-route`" />

+                                    <parameter name="original_string" value="`$prop.l3vpn.ac1_route`" />

                                     <parameter name="regex" value=" ## " />

                                     <parameter name="ctx_memory_result_key" value="route1" />

                                     <outcome value="success">

@@ -178,7 +178,7 @@
                                     <parameter name="prop.l3vpn.ac2_route" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

                                 </set>

                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">

-                                    <parameter name="original_string" value="`$prop.l3vpn.ac2-route`" />

+                                    <parameter name="original_string" value="`$prop.l3vpn.ac2_route`" />

                                     <parameter name="regex" value=" ## " />

                                     <parameter name="ctx_memory_result_key" value="route2" />

                                     <outcome value="success">

@@ -276,7 +276,7 @@
                 </outcome>

             </execute>

             <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID">

-                <parameter name="ctx-destination" value="prop.l3vpn.vpn-policy2-id" />

+                <parameter name="ctx-destination" value="prop.l3vpn.entry1-id" />

                 <outcome value="failure">

                     <return status="failure">

                         <parameter name="error-code" value="" />

@@ -284,10 +284,6 @@
                     </return>

                 </outcome>

             </execute>

-            <set>

-                <parameter name="prop.l3vpn.entry1-id" value="1" />

-                <parameter name="prop.l3vpn.entry2-id" value="1" />

-            </set>

             <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID">

                 <parameter name="ctx-destination" value="prop.l3vpn.vrf1-id" />

                 <outcome value="failure">

@@ -342,20 +338,20 @@
                 <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="field20" value="`l3vpn.ac1_svlan`" />

+                <parameter name="field21" value="`$prop.l3vpn.ac1_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="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`" />

@@ -372,20 +368,20 @@
                 <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="field50" value="`l3vpn.ac2_svlan`" />

+                <parameter name="field51" value="`$prop.l3vpn.ac2_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="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`" />

@@ -406,9 +402,13 @@
                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="post" />

                             <parameter name="responsePrefix" value="token-result" />

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />

+                            <parameter name="trustStorePassword" value="adminadmin" />

+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />

+                            <parameter name="keyStorePassword" value="adminadmin" />

                             <outcome value="success">

                                 <set>

-                                    <parameter name="prop.sdncRestApi.token_id" value="$token-result.token_id" />

+                                    <parameter name="prop.sdncRestApi.token_id" value="`$token-result.data.token_id`" />

                                 </set>

                             </outcome>

                             <outcome value="failure">

@@ -427,31 +427,43 @@
                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="post" />

                             <parameter name="responsePrefix" value="vpn-result" />

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />

+                            <parameter name="trustStorePassword" value="adminadmin" />

+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />

+                            <parameter name="keyStorePassword" value="adminadmin" />

                             <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" />

+                                    <parameter name="error-message" value="Error executing Create vpn rest api" />

                                 </return>

                             </outcome>

+                            <outcome value="success">

+                                <block atomic="true" />

+                            </outcome>

                         </execute>

                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

                             <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="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/huawei-ac-net-l3vpn-svc-vfi: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="httpMethod" value="put" />

                             <parameter name="responsePrefix" value="vrf-result" />

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />

+                            <parameter name="trustStorePassword" value="adminadmin" />

+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />

+                            <parameter name="keyStorePassword" value="adminadmin" />

                             <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

-                            <outcome value="success" />

+                            <outcome value="success">

+                                <block atomic="true" />

+                            </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 3rd party controller rest api" />

+                                    <parameter name="error-message" value="Error executing Create vrf rest api" />

                                 </return>

                             </outcome>

                         </execute>

@@ -463,13 +475,19 @@
                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="post" />

                             <parameter name="responsePrefix" value="site-result" />

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />

+                            <parameter name="trustStorePassword" value="adminadmin" />

+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />

+                            <parameter name="keyStorePassword" value="adminadmin" />

                             <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

-                            <outcome value="success" />

+                            <outcome value="success">

+                                <block atomic="true" />

+                            </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 3rd party controller rest api" />

+                                    <parameter name="error-message" value="Error executing Create site rest api" />

                                 </return>

                             </outcome>

                         </execute>

@@ -477,11 +495,11 @@
                 </outcome>

                 <outcome value="l3vpn-sptn">

                     <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

-                        <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" />

-                        <parameter name="format" value="json" />

+                        <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/sptn-l3vpn-template.xml'`" />

+                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/sptn-service-l3vpn:service/snc-l3vpns'`" />

+                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

+                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

+                        <parameter name="format" value="xml" />

                         <parameter name="httpMethod" value="post" />

                         <parameter name="responsePrefix" value="restapi-result" />

                     </execute>