Update underlay DG for integration issues

*Fix typo mistakes in underlay network-input-parameter names
*Fix rest api parameters for IP-WAN & SPTN controller
*Update underlay JSON template for IP-WAN controller

Change-Id: I6308b7123561c032093dbff65b770389f92ca4fc
Issue-Id: SDNC-188
Signed-off-by: Ramu N <ramu.n@huawei.com>
Former-commit-id: 17cfd6d0d69e6da78d55cb76ed0446fca170eead

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
index dc7dae8..4f1126c 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
@@ -66,7 +66,6 @@
         "e986dd0a.7fdf58",
         "ba17de0c.0ea5e",
         "39b02aa1.204f3e",
-        "eb55ec0a.7da3a8",
         "bee6a021.504aa8",
         "f7d82967.39b968",
         "e292252a.39cff8",
@@ -87,7 +86,7 @@
     "id": "ec4c3437.b9425",
     "type": "execute",
     "name": "execute RestApiCallNode Create IPWAN L3VPN",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/l3smvpntemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/l3smvpntemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
     "x": 1121.0001831054688,
@@ -96,7 +95,7 @@
     "wires": [
       [
         "d40cc8a7.624908",
-        "550c17e5.cfd818"
+        "c80688e8.50ffd"
       ]
     ]
   },
@@ -131,11 +130,11 @@
     "id": "257293b6.92d5cc",
     "type": "execute",
     "name": "execute RestApiCallNode Create SPTN L3VPN",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.restapi.templateDir +'/sptn-l3vpn-template.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir +'/sptn-l3vpn-template.xml'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/sptn-service-l3vpn:service/snc-l3vpns'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"xml\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1157.6668701171875,
-    "y": 1239.666748046875,
+    "x": 1053.6668701171875,
+    "y": 1261.666748046875,
     "z": "d1c71750.37b338",
     "wires": [
       []
@@ -1279,7 +1278,7 @@
     "id": "e986dd0a.7fdf58",
     "type": "record",
     "name": "record",
-    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"network-topology-operation-create\"/>\n<parameter name=\"field3\" value=\"L3VPN-Config\"/>\n<parameter name=\"field4\" value=\"`l3vpn.name`\"/>\n<parameter name=\"field5\" value=\"`$prop.l3vpn.name`\"/>\n<parameter name=\"field6\" value=\"`l3vpn.topology`\"/>\n<parameter name=\"field7\" value=\"`$prop.l3vpn.topology`\"/>\n<parameter name=\"field8\" value=\"`l3vpn.site1_name`\"/>\n<parameter name=\"field9\" value=\"`$prop.l3vpn.site1_name`\"/>\n<parameter name=\"field10\" value=\"`l3vpn.vpn-policy1-id`\"/>\n<parameter name=\"field11\" value=\"`$prop.l3vpn.vpn-policy1-id`\"/>\n<parameter name=\"field12\" value=\"`l3vpn.entry1-id`\"/>\n<parameter name=\"field13\" value=\"`$prop.l3vpn.entry1-id`\"/>\n<parameter name=\"field14\" value=\"`l3vpn.sna1_name`\"/>\n<parameter name=\"field15\" value=\"`$prop.l3vpn.sna1_name`\"/>\n<parameter name=\"field16\" value=\"`l3vpn.pe1_id`\"/>\n<parameter name=\"field17\" value=\"`$prop.l3vpn.pe1_id`\"/>\n<parameter name=\"field18\" value=\"`l3vpn.ac1_id`\"/>\n<parameter name=\"field19\" value=\"`$prop.l3vpn.ac1_id`\"/>\n<parameter name=\"field20\" value=\"`l3vpn.sna1_svlan`\"/>\n<parameter name=\"field21\" value=\"`$prop.l3vpn.sna1_svlan`\"/>\n<parameter name=\"field22\" value=\"`l3vpn.ac1-peer-ip`\"/>\n<parameter name=\"field23\" value=\"`$prop.l3vpn.ac1-peer-ip`\"/>\n<parameter name=\"field24\" value=\"`l3vpn.ac1-ip`\"/>\n<parameter name=\"field25\" value=\"`$prop.l3vpn.ac1-ip`\"/>\n<parameter name=\"field26\" value=\"`l3vpn.ac1_protocol`\"/>\n<parameter name=\"field27\" value=\"`$prop.l3vpn.ac1_protocol`\"/>\n<parameter name=\"field28\" value=\"`l3vpn.sna1-route-ip-prefix`\"/>\n<parameter name=\"field29\" value=\"`$prop.l3vpn.sna1-route-ip-prefix`\"/>\n<parameter name=\"field30\" value=\"`l3vpn.sna1-route-next-hop`\"/>\n<parameter name=\"field31\" value=\"`$prop.l3vpn.sna1-route-next-hop`\"/>\n<parameter name=\"field32\" value=\"`l3vpn.peer1-ip`\"/>\n<parameter name=\"field33\" value=\"`$prop.l3vpn.peer1-ip`\"/>\n<parameter name=\"field34\" value=\"`l3vpn.ac1_protocol_bgp_as`\"/>\n<parameter name=\"field35\" value=\"`$prop.l3vpn.ac1_protocol_bgp_as`\"/>\n<parameter name=\"field36\" value=\"`l3vpn.vrf1-id`\"/>\n<parameter name=\"field37\" value=\"`$prop.l3vpn.vrf1-id`\"/>\n<parameter name=\"field38\" value=\"`l3vpn.site2_name`\"/>\n<parameter name=\"field39\" value=\"`$prop.l3vpn.site2_name`\"/>\n<parameter name=\"field40\" value=\"`l3vpn.vpn-policy2-id`\"/>\n<parameter name=\"field41\" value=\"`$prop.l3vpn.vpn-policy2-id`\"/>\n<parameter name=\"field42\" value=\"`l3vpn.entry2-id`\"/>\n<parameter name=\"field43\" value=\"`$prop.l3vpn.entry2-id`\"/>\n<parameter name=\"field44\" value=\"`l3vpn.sna2_name`\"/>\n<parameter name=\"field45\" value=\"`$prop.l3vpn.sna2_name`\"/>\n<parameter name=\"field46\" value=\"`l3vpn.pe2_id`\"/>\n<parameter name=\"field47\" value=\"`$prop.l3vpn.pe2_id`\"/>\n<parameter name=\"field48\" value=\"`l3vpn.ac2_id`\"/>\n<parameter name=\"field49\" value=\"`$prop.l3vpn.ac2_id`\"/>\n<parameter name=\"field50\" value=\"`l3vpn.sna2_svlan`\"/>\n<parameter name=\"field51\" value=\"`$prop.l3vpn.sna2_svlan`\"/>\n<parameter name=\"field52\" value=\"`l3vpn.ac2-peer-ip`\"/>\n<parameter name=\"field53\" value=\"`$prop.l3vpn.ac2-peer-ip`\"/>\n<parameter name=\"field54\" value=\"`l3vpn.ac2-ip`\"/>\n<parameter name=\"field55\" value=\"`$prop.l3vpn.ac2-ip`\"/>\n<parameter name=\"field56\" value=\"`l3vpn.ac2_protocol`\"/>\n<parameter name=\"field57\" value=\"`$prop.l3vpn.ac2_protocol`\"/>\n<parameter name=\"field58\" value=\"`l3vpn.sna2-route-ip-prefix`\"/>\n<parameter name=\"field59\" value=\"`$prop.l3vpn.sna2-route-ip-prefix`\"/>\n<parameter name=\"field60\" value=\"`l3vpn.sna2-route-next-hop`\"/>\n<parameter name=\"field61\" value=\"`$prop.l3vpn.sna2-route-next-hop`\"/>\n<parameter name=\"field62\" value=\"`l3vpn.peer2-ip`\"/>\n<parameter name=\"field63\" value=\"`$prop.l3vpn.peer2-ip`\"/>\n<parameter name=\"field64\" value=\"`l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"field65\" value=\"`$prop.l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"field66\" value=\"`l3vpn.vrf2-id`\"/>\n<parameter name=\"field67\" value=\"`$prop.l3vpn.vrf2-id`\"/>\n<parameter name=\"field68\" value=\"`l3vpn.af_type`\"/>\n<parameter name=\"field69\" value=\"`$prop.l3vpn.af_type`\"/>",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"network-topology-operation-create\"/>\n<parameter name=\"field3\" value=\"L3VPN-Config\"/>\n<parameter name=\"field4\" value=\"`l3vpn.name`\"/>\n<parameter name=\"field5\" value=\"`$prop.l3vpn.name`\"/>\n<parameter name=\"field6\" value=\"`l3vpn.topology`\"/>\n<parameter name=\"field7\" value=\"`$prop.l3vpn.topology`\"/>\n<parameter name=\"field8\" value=\"`l3vpn.site1_name`\"/>\n<parameter name=\"field9\" value=\"`$prop.l3vpn.site1_name`\"/>\n<parameter name=\"field10\" value=\"`l3vpn.vpn-policy1-id`\"/>\n<parameter name=\"field11\" value=\"`$prop.l3vpn.vpn-policy1-id`\"/>\n<parameter name=\"field12\" value=\"`l3vpn.entry1-id`\"/>\n<parameter name=\"field13\" value=\"`$prop.l3vpn.entry1-id`\"/>\n<parameter name=\"field14\" value=\"`l3vpn.sna1_name`\"/>\n<parameter name=\"field15\" value=\"`$prop.l3vpn.sna1_name`\"/>\n<parameter name=\"field16\" value=\"`l3vpn.pe1_id`\"/>\n<parameter name=\"field17\" value=\"`$prop.l3vpn.pe1_id`\"/>\n<parameter name=\"field18\" value=\"`l3vpn.ac1_id`\"/>\n<parameter name=\"field19\" value=\"`$prop.l3vpn.ac1_id`\"/>\n<parameter name=\"field20\" value=\"`l3vpn.ac1_svlan`\"/>\n<parameter name=\"field21\" value=\"`$prop.l3vpn.ac1_svlan`\"/>\n<parameter name=\"field22\" value=\"`l3vpn.ac1_peer_ip`\"/>\n<parameter name=\"field23\" value=\"`$prop.l3vpn.ac1_peer_ip`\"/>\n<parameter name=\"field24\" value=\"`l3vpn.ac1_ip`\"/>\n<parameter name=\"field25\" value=\"`$prop.l3vpn.ac1_ip`\"/>\n<parameter name=\"field26\" value=\"`l3vpn.ac1_protocol`\"/>\n<parameter name=\"field27\" value=\"`$prop.l3vpn.ac1_protocol`\"/>\n<parameter name=\"field28\" value=\"`l3vpn.sna1-route-ip-prefix`\"/>\n<parameter name=\"field29\" value=\"`$prop.l3vpn.sna1-route-ip-prefix`\"/>\n<parameter name=\"field30\" value=\"`l3vpn.sna1-route-next-hop`\"/>\n<parameter name=\"field31\" value=\"`$prop.l3vpn.sna1-route-next-hop`\"/>\n<parameter name=\"field32\" value=\"`l3vpn.peer1_ip`\"/>\n<parameter name=\"field33\" value=\"`$prop.l3vpn.peer1_ip`\"/>\n<parameter name=\"field34\" value=\"`l3vpn.ac1_protocol_bgp_as`\"/>\n<parameter name=\"field35\" value=\"`$prop.l3vpn.ac1_protocol_bgp_as`\"/>\n<parameter name=\"field36\" value=\"`l3vpn.vrf1-id`\"/>\n<parameter name=\"field37\" value=\"`$prop.l3vpn.vrf1-id`\"/>\n<parameter name=\"field38\" value=\"`l3vpn.site2_name`\"/>\n<parameter name=\"field39\" value=\"`$prop.l3vpn.site2_name`\"/>\n<parameter name=\"field40\" value=\"`l3vpn.vpn-policy2-id`\"/>\n<parameter name=\"field41\" value=\"`$prop.l3vpn.vpn-policy2-id`\"/>\n<parameter name=\"field42\" value=\"`l3vpn.entry2-id`\"/>\n<parameter name=\"field43\" value=\"`$prop.l3vpn.entry2-id`\"/>\n<parameter name=\"field44\" value=\"`l3vpn.sna2_name`\"/>\n<parameter name=\"field45\" value=\"`$prop.l3vpn.sna2_name`\"/>\n<parameter name=\"field46\" value=\"`l3vpn.pe2_id`\"/>\n<parameter name=\"field47\" value=\"`$prop.l3vpn.pe2_id`\"/>\n<parameter name=\"field48\" value=\"`l3vpn.ac2_id`\"/>\n<parameter name=\"field49\" value=\"`$prop.l3vpn.ac2_id`\"/>\n<parameter name=\"field50\" value=\"`l3vpn.ac2_svlan`\"/>\n<parameter name=\"field51\" value=\"`$prop.l3vpn.ac2_svlan`\"/>\n<parameter name=\"field52\" value=\"`l3vpn.ac2_peer_ip`\"/>\n<parameter name=\"field53\" value=\"`$prop.l3vpn.ac2_peer_ip`\"/>\n<parameter name=\"field54\" value=\"`l3vpn.ac2_ip`\"/>\n<parameter name=\"field55\" value=\"`$prop.l3vpn.ac2_ip`\"/>\n<parameter name=\"field56\" value=\"`l3vpn.ac2_protocol`\"/>\n<parameter name=\"field57\" value=\"`$prop.l3vpn.ac2_protocol`\"/>\n<parameter name=\"field58\" value=\"`l3vpn.sna2-route-ip-prefix`\"/>\n<parameter name=\"field59\" value=\"`$prop.l3vpn.sna2-route-ip-prefix`\"/>\n<parameter name=\"field60\" value=\"`l3vpn.sna2-route-next-hop`\"/>\n<parameter name=\"field61\" value=\"`$prop.l3vpn.sna2-route-next-hop`\"/>\n<parameter name=\"field62\" value=\"`l3vpn.peer2_ip`\"/>\n<parameter name=\"field63\" value=\"`$prop.l3vpn.peer2_ip`\"/>\n<parameter name=\"field64\" value=\"`l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"field65\" value=\"`$prop.l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"field66\" value=\"`l3vpn.vrf2-id`\"/>\n<parameter name=\"field67\" value=\"`$prop.l3vpn.vrf2-id`\"/>\n<parameter name=\"field68\" value=\"`l3vpn.af_type`\"/>\n<parameter name=\"field69\" value=\"`$prop.l3vpn.af_type`\"/>",
     "comments": "",
     "outputs": 1,
     "x": 726,
@@ -1296,8 +1295,8 @@
     "xml": "<switch test=\"`$prop.l3vpn.service-type`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 712,
-    "y": 1143.0000305175781,
+    "x": 611,
+    "y": 1143,
     "z": "d1c71750.37b338",
     "wires": [
       [
@@ -1314,8 +1313,8 @@
     "xml": "<outcome value='l3vpn-ipwan'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 667,
-    "y": 1060,
+    "x": 705,
+    "y": 1070,
     "z": "d1c71750.37b338",
     "wires": [
       [
@@ -1330,8 +1329,8 @@
     "xml": "<outcome value='l3vpn-sptn'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 856,
-    "y": 1247,
+    "x": 786,
+    "y": 1258,
     "z": "d1c71750.37b338",
     "wires": [
       [
@@ -1346,8 +1345,8 @@
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 852,
-    "y": 1291,
+    "x": 779,
+    "y": 1304,
     "z": "d1c71750.37b338",
     "wires": [
       [
@@ -1361,16 +1360,16 @@
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Unexpected error retrieving vpn binding\" />\n\n",
     "comments": "",
-    "x": 1035,
-    "y": 1290,
+    "x": 942,
+    "y": 1308,
     "z": "d1c71750.37b338",
     "wires": []
   },
   {
     "id": "39b02aa1.204f3e",
     "type": "execute",
-    "name": "execute vpn-policy2-id",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vpn-policy2-id\"/>\n",
+    "name": "execute vpn-policy1 entry id",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.entry1-id\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 820,
@@ -1409,22 +1408,11 @@
     "z": "d1c71750.37b338",
     "wires": []
   },
-  {
-    "id": "eb55ec0a.7da3a8",
-    "type": "set",
-    "name": "set policy entry",
-    "xml": "<set>\n<parameter name='prop.l3vpn.entry1-id' value='1' />\n<parameter name='prop.l3vpn.entry2-id' value='1' />\n\n",
-    "comments": "",
-    "x": 806,
-    "y": 569,
-    "z": "d1c71750.37b338",
-    "wires": []
-  },
   {
     "id": "521ff026.a9cd98",
     "type": "execute",
     "name": "execute split ac1-route",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.l3vpn.ac1-route`'/>\n<parameter name=\"regex\" value=\" ## \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route1\"/>\n",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.l3vpn.ac1_route`'/>\n<parameter name=\"regex\" value=\" ## \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route1\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 2210,
@@ -1527,7 +1515,7 @@
     "id": "e2a6c5f2.23e27",
     "type": "execute",
     "name": "execute split ac2-route",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.l3vpn.ac2-route`'/>\n<parameter name=\"regex\" value=\" ## \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route2\"/>\n",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.l3vpn.ac2_route`'/>\n<parameter name=\"regex\" value=\" ## \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route2\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 2203,
@@ -1670,8 +1658,8 @@
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 834,
-    "y": 1060,
+    "x": 838,
+    "y": 1135,
     "z": "d1c71750.37b338",
     "wires": [
       [
@@ -1686,16 +1674,16 @@
     "id": "c47fb352.4e0cc",
     "type": "execute",
     "name": "execute RestApiCallNode IPWAN Site Config",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir +'/l3smsitetemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"site-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir +'/l3smsitetemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"site-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1111,
-    "y": 1181.0000305175781,
+    "x": 1106,
+    "y": 1219,
     "z": "d1c71750.37b338",
     "wires": [
       [
         "d40cc8a7.624908",
-        "550c17e5.cfd818"
+        "df1ccdd8.7bf27"
       ]
     ]
   },
@@ -1703,11 +1691,11 @@
     "id": "59489a1b.74de3c",
     "type": "execute",
     "name": "execute RestApiCallNode IPWAN VRF Config",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir +'/l3smvrftemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vrf-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir +'/l3smvrftemplate.json'`\"/>\n<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'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vrf-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1091,
-    "y": 1121.0000305175781,
+    "x": 1120,
+    "y": 1122,
     "z": "d1c71750.37b338",
     "wires": [
       [
@@ -2125,7 +2113,7 @@
     "id": "e652cb3f.9ae0d",
     "type": "execute",
     "name": "execute RestApiCallNode Get token",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
     "comments": "",
     "outputs": 1,
     "x": 979,
@@ -2185,7 +2173,7 @@
     "id": "8a3a1639.1431d",
     "type": "set",
     "name": "set token-id",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='$token-result.token_id' />\n",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
     "comments": "",
     "x": 1368,
     "y": 906,
@@ -2203,7 +2191,9 @@
     "y": 1078,
     "z": "d1c71750.37b338",
     "wires": [
-      []
+      [
+        "28652dba.d39e02"
+      ]
     ]
   },
   {
@@ -2226,7 +2216,7 @@
     "id": "d57e2b04.e0fea",
     "type": "returnFailure",
     "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing 3rd party controller rest api\" />\n",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vrf rest api\" />\n",
     "comments": "",
     "x": 1373,
     "y": 1357.3929443359375,
@@ -2246,5 +2236,74 @@
     "wires": [
       []
     ]
+  },
+  {
+    "id": "28652dba.d39e02",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1234,
+    "y": 1409,
+    "z": "d1c71750.37b338",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "df1ccdd8.7bf27",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1324,
+    "y": 1473,
+    "z": "d1c71750.37b338",
+    "wires": [
+      [
+        "948b66a6.ef156"
+      ]
+    ]
+  },
+  {
+    "id": "948b66a6.ef156",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create site rest api\" />\n",
+    "comments": "",
+    "x": 1353.75,
+    "y": 1530.7501220703125,
+    "z": "d1c71750.37b338",
+    "wires": []
+  },
+  {
+    "id": "359e3cd1.226de4",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
+    "comments": "",
+    "x": 1210,
+    "y": 1061,
+    "z": "d1c71750.37b338",
+    "wires": []
+  },
+  {
+    "id": "c80688e8.50ffd",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1065,
+    "y": 1058,
+    "z": "d1c71750.37b338",
+    "wires": [
+      [
+        "359e3cd1.226de4"
+      ]
+    ]
   }
 ]

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 d7ee6d0..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
@@ -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.restapi.templateDir +'/sptn-l3vpn-template.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

diff --git a/platform-logic/restapi-templates/src/main/json/l3smsitetemplate.json b/platform-logic/restapi-templates/src/main/json/l3smsitetemplate.json
index 016879c..585c311 100644 (file)
--- a/platform-logic/restapi-templates/src/main/json/l3smsitetemplate.json
+++ b/platform-logic/restapi-templates/src/main/json/l3smsitetemplate.json
@@ -23,18 +23,24 @@
   "site":[
   {
   "site-id": ${prop.l3vpn.site1_name},
+  "site-name":"Site-forhuawei1",
+  "vrf-control-option": {
+    "custom-vrf": "true",
+    "vrf-definition-policy": "site-and-vpn-policy"
+  },
   "vpn-policies": {
     "vpn-policy": [
       {
         "vpn-policy-id": ${prop.l3vpn.vpn-policy1-id},
+        "vpn-policy-name": "policy-forhuawei1",
         "entries": [
-          {
-            "id": ${prop.l3vpn.entry1-id},
-            "vpn": {
-              "vpn-id": ${prop.l3vpn.name},
-              "site-role": "huawei-ac-net-l3vpn-svc:any-to-any-role"
-            }
+        {
+          "id": ${prop.l3vpn.entry1-id},
+          "vpn": {
+          "vpn-id": ${prop.l3vpn.name},
+          "site-role": "huawei-ac-net-l3vpn-svc:any-to-any-role"
           }
+        }
         ]
       }
     ]
@@ -47,136 +53,93 @@
           "appointed-access": {
             "ne-id": ${prop.l3vpn.pe1_id},
             "ltp-id": ${prop.l3vpn.ac1_id},
+            "admin-status":"admin-up",
             "vlan": {
-              "type": "huawei-ac-net-l3vpn-svc:vlan-dot1q",
-              "vlan-id": ${prop.l3vpn.sna1_svlan}
+              "huawei-ac-net-l3vpn-svc:type": "vlan-dot1q",
+              "vlan-id": ${prop.l3vpn.ac1_svlan},
+              "sub-if-number":"dyn-allocate"
             }
           }
         },
         "ip-connection": {
           "ipv4": {
-            "address-allocation-type": "huawei-ac-net-l3vpn-svc:static-address",
             "addresses": {
-              "provider-address": ${prop.l3vpn.ac1-peer-ip},
-              "customer-address": ${prop.l3vpn.ac1-ip},
-              "mask": "24"
+              "provider-address": ${prop.l3vpn.ac1_ip},
+              "customer-address": ${prop.l3vpn.ac1_peer_ip},
+              "mask": "30"
             }
           }
         },
-        "service": {
-          "mtu": "1500"
-        },
         "routing-protocols": {
           "routing-protocol": [
             {
               "type": ${prop.l3vpn.ac1_protocol},
               "static": {
-                "cascaded-lan-prefixes": [
+                "cascaded-lan-prefixes": 
                   {
                     "ipv4-lan-prefixes": [
                       {
                         "ip-prefix": ${prop.l3vpn.sna1-route.ip-prefix},
-                        "next-hop": ${prop.l3vpn.sna1-route.next-hop}
+                        "next-hop": ${prop.l3vpn.sna1-route.next-hop},
+                        "preference":"100"
                       }
                     ]
                   }
-                ]
-              }
-              "bgp": {
-                "peers": [
-                  {
-                    "peer-ip": ${prop.l3vpn.peer1-ip},
-                    "remote-as": ${prop.l3vpn.ac1_protocol_bgp_as}
-                  }
-                ]
               }
             }
-            }
           ]
         },
         "vpn-attachment": {
-          "vpn-policy-id": ${prop.l3vpn.name}
-        }
-      }
-    ]
-  },
-  {
-    "site-id": ${prop.l3vpn.site2_name},
-    "vpn-policies": {
-    "vpn-policy": [
-      {
-        "vpn-policy-id": ${prop.l3vpn.vpn-policy2-id},
-        "entries": [
-        {
-          "id": ${prop.l3vpn.entry2-id},
-          "vpn": {
-          "vpn-id": ${prop.l3vpn.name},
-          "site-role": "huawei-ac-net-l3vpn-svc:any-to-any-role"
-          }
+          "vpn-policy-id": ${prop.l3vpn.vpn-policy1-id}
         }
-        ]
-      }
-      ]
-    },
-    "site-network-accesses": {
-    "site-network-access": [
+      },
       {
-        "site-network-access-id": ${prop.l3vpn.sna2_name},
-      "bearer": {
-        "appointed-access": {
-          "ne-id": ${prop.l3vpn.pe2_id},
+  "site-network-access-id": ${prop.l3vpn.sna2_name},
+  "bearer": {
+    "appointed-access": {
+      "ne-id": ${prop.l3vpn.pe2_id},
       "ltp-id": ${prop.l3vpn.ac2_id},
+      "admin-status": "admin-up",
       "vlan": {
-        "type": "huawei-ac-net-l3vpn-svc:vlan-dot1q",
-        "vlan-id": ${prop.l3vpn.sna2_svlan}
-    }
+        "huawei-ac-net-l3vpn-svc:type": "vlan-dot1q",
+        "vlan-id": ${prop.l3vpn.ac2_svlan},
+        "sub-if-number": "dyn-allocate"
+      }
     }
-    },
-      "ip-connection": {
-        "ipv4": {
-          "address-allocation-type": "huawei-ac-net-l3vpn-svc:static-address",
-          "addresses": {
-            "provider-address": ${prop.l3vpn.ac2-peer-ip},
-      "customer-address": ${prop.l3vpn.ac2-ip},
-      "mask": "24"
+  },
+  "ip-connection": {
+    "ipv4": {
+      "addresses": {
+        "provider-address": ${prop.l3vpn.ac2_ip},
+        "customer-address": ${prop.l3vpn.ac2_peer_ip},
+        "mask": "30"
       }
     }
-    },
-      "service": {
-        "mtu": "1500"
-      },
-      "routing-protocols": {
-        "routing-protocol": [
-          {
-            "type": ${prop.l3vpn.ac2_protocol},
-            "static": {
-              "cascaded-lan-prefixes": [
-                {
-                  "ipv4-lan-prefixes": [
-                    {
-                      "ip-prefix": ${prop.l3vpn.sna2-route.ip-prefix},
-                      "next-hop": ${prop.l3vpn.sna2-route.next-hop}
-                  }
-                  ]
-                }
-              ]
-            }
-            "bgp": {
-              "peers": [
-                {
-                  "peer-ip": ${prop.l3vpn.peer2-ip},
-                  "remote-as": ${prop.l3vpn.ac2_protocol_bgp_as}
-                }
-              ]
-            }
+  },
+  "routing-protocols": {
+    "routing-protocol": [
+      {
+        "huawei-ac-net-l3vpn-svc:type": ${prop.l3vpn.ac2_protocol},
+        "static": {
+          "cascaded-lan-prefixes": {
+            "ipv4-lan-prefixes": [
+              {
+                "ip-prefix": ${prop.l3vpn.sna2-route.ip-prefix},
+                "next-hop": ${prop.l3vpn.sna2-route.next-hop},
+                "preference": "100"
+              }
+            ]
           }
-        ]
-      },
-      "vpn-attachment": {
-        "vpn-policy-id": ${prop.l3vpn.name}
-    }
-    }
+        }
+      }
     ]
+  },
+  "vpn-attachment": {
+    "vpn-policy-id": ${prop.l3vpn.vpn-policy1-id}
+  }
+}
+]
+}
   }
  ]
 }

diff --git a/platform-logic/restapi-templates/src/main/json/l3smvpntemplate.json b/platform-logic/restapi-templates/src/main/json/l3smvpntemplate.json
index 67f127c..fa940a4 100644 (file)
--- a/platform-logic/restapi-templates/src/main/json/l3smvpntemplate.json
+++ b/platform-logic/restapi-templates/src/main/json/l3smvpntemplate.json
@@ -25,7 +25,8 @@
       "vpn-id": ${prop.l3vpn.name},
       "customer-name": "huawei",
       "vpn-service-topology": ${prop.l3vpn.topology},
-      "route-exchange-policy": "huawei-ac-net-l3vpn-svc:vpnv4-way"
+      "route-exchange-policy": "vpnv4-way",
+      "address-family":"ipv4", 
     }
   ]
 }

diff --git a/platform-logic/restapi-templates/src/main/json/l3smvrftemplate.json b/platform-logic/restapi-templates/src/main/json/l3smvrftemplate.json
index 732af27..1957135 100644 (file)
--- a/platform-logic/restapi-templates/src/main/json/l3smvrftemplate.json
+++ b/platform-logic/restapi-templates/src/main/json/l3smvrftemplate.json
@@ -20,16 +20,96 @@
  */
 
 {
+  "huawei-ac-net-l3vpn-svc-vfi:vrf-attributes": {
     "vrf-attribute": [
         {
             "vrf-attribute-id": ${prop.l3vpn.vrf1-id},
             "ne-id": ${prop.l3vpn.pe1_id},
-            "vpn-policy-id": ${prop.l3vpn.vpn-policy1-id}
+            "vpn-policy-id": ${prop.l3vpn.vpn-policy1-id},
+            "site-id": ${prop.l3vpn.site1_name},
+          "address-families": {
+    "address-family": [
+      {
+        "af-type": "ipv4",
+        "tunnel-service": {
+          "type": "huawei-ac-net-l3vpn-svc-vfi:auto-select",
+          "auto-select": {
+            "select-tunnels": {
+              "select-tunnel": {
+                "type": "ldp",
+                "priority": 3
+              }
+            }
+          }
+        },
+        "access-protocols": {
+          "protocol": {
+            "type": "huawei-ac-net-l3vpn-svc:bgp",
+            "bgp": {
+              "import-routes": {
+                "import-route": [{
+                  "type": "huawei-ac-net-l3vpn-svc:static",
+                  "policy-type": "none"
+                },
+                {
+                  "type": "huawei-ac-net-l3vpn-svc:direct",
+                  "policy-type": "none"
+                }
+                ]
+              }
+            }
+          }
+        },
+        "popgo": true
+      }
+    ]
+  }
         },
         {
             "vrf-attribute-id": ${prop.l3vpn.vrf2-id},
             "ne-id": ${prop.l3vpn.pe2_id},
-            "vpn-policy-id": ${prop.l3vpn.vpn-policy2-id}
+            "vpn-policy-id": ${prop.l3vpn.vpn-policy1-id},
+            "site-id": ${prop.l3vpn.site1_name},
+              "address-families": {
+    "address-family": [
+      {
+        "af-type": "ipv4",
+        "tunnel-service": {
+          "type": "huawei-ac-net-l3vpn-svc-vfi:auto-select",
+          "auto-select": {
+            "select-tunnels": {
+              "select-tunnel": [
+                {
+                  "type": "ldp",
+                  "priority": 3
+                }
+              ]
+            }
+          }
+        },
+        "access-protocols": {
+          "protocol": {
+            "type": "huawei-ac-net-l3vpn-svc:bgp",
+            "bgp": {
+              "import-routes": {
+                "import-route": [{
+                  "type": "huawei-ac-net-l3vpn-svc:static",
+                  "policy-type": "none"
+                },
+                {
+                  "type": "huawei-ac-net-l3vpn-svc:direct",
+                  "policy-type": "none"
+                }
+                ]
+              }
+            }
+          }
+        },
+        "popgo": true
+      }
+    ]
+  }
         }
     ]
+  }
 }