Fix SDWAN restapi templates

SDWAN controller requests is updated with
correct parameters and values

Change-Id: I36f3309b93a9255a5d94ac060c50f8c3256b1f37
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
Former-commit-id: 986ea914320fe9bd52cefcb6fc9307e1f302af37

diff --git a/platform-logic/restapi-templates/src/main/json/sdlan-ip-subnets.json b/platform-logic/restapi-templates/src/main/json/sdlan-ip-subnets.json
index 85ccf15..504be83 100644 (file)
--- a/platform-logic/restapi-templates/src/main/json/sdlan-ip-subnets.json
+++ b/platform-logic/restapi-templates/src/main/json/sdlan-ip-subnets.json
@@ -2,7 +2,7 @@
   "IPSubnets":[
   {
     "vpnId": ${prop.vpnId},
-    "siteId": ${prop.lan.siteId},
+    "siteId": ${prop.siteId},
     "deviceId": ${prop.lan.deviceId},
     "id": "",
     "interfaceType": "interface",

diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-network-orchestration.json b/platform-logic/restapi-templates/src/main/json/sdwan-network-orchestration.json
index a871f11..e2b9903 100644 (file)
--- a/platform-logic/restapi-templates/src/main/json/sdwan-network-orchestration.json
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-network-orchestration.json
@@ -1,5 +1,5 @@
 {
-    "bpgAsNum": 65101,
+    "bgpAsNum": 65101,
     "vpnType": "dsvpn",
     "siteScale":"30",
     "dsvpnIPpool": ["100.1.0.0/16"],
@@ -22,4 +22,4 @@
       "encrptionAlgorithm":"AES128",
       "preSharedKey": "Admin@12134=========================================="
     }
-}
\ No newline at end of file
+}

diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-tenant.json b/platform-logic/restapi-templates/src/main/json/sdwan-tenant.json
index 6161b1b..5f85aa2 100644 (file)
--- a/platform-logic/restapi-templates/src/main/json/sdwan-tenant.json
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-tenant.json
@@ -7,7 +7,7 @@
     "limitAccountNum": 1000,
     "userAccount": ${prop.userAccount},
     "userEmail": ${prop.userEmail},
-    "sendInitEmailEnable": "true",
+    "sendInitEmailEnable": "false",
     "countryCode": "CN",
     "userPassword": "Test@12345"
-}
\ No newline at end of file
+}

diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-vpn.json b/platform-logic/restapi-templates/src/main/json/sdwan-vpn.json
index 11412b4..f1192a2 100644 (file)
--- a/platform-logic/restapi-templates/src/main/json/sdwan-vpn.json
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-vpn.json
@@ -2,7 +2,7 @@
     "vpns": [
         {
             "name": ${prop.name},
-            "id": ${prop.vpn1Id},
+            "id": ${prop.vpnId},
             "siteIds": [
                 ${repeat:prop.siteIds_length:
                  ${prop.siteIds[${1}]},
@@ -10,4 +10,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}

diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-dhcp.json b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-dhcp.json
index 58cf796..3f07b60 100644 (file)
--- a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-dhcp.json
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-dhcp.json
@@ -9,7 +9,7 @@
             "vlanId": "null",            
             "ipConnection": {
                 "ipv4": {
-                    "publicIP": null,
+                    "publicIP": ${prop.wan.ipAddress},
                     "accessType": "IPoE",
                     "ipMode": "DHCP",
                     "customerAddress": "",

diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-static.json b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-static.json
index 9825b6e..ce9d4f2 100644 (file)
--- a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-static.json
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-static.json
@@ -9,7 +9,7 @@
             "vlanId": "null",            
             "ipConnection": {
                 "ipv4": {
-                    "publicIP": null,
+                    "publicIP": ${prop.wan.ip-address},
                     "accessType": "IPoE",
                     "ipMode": "Static",
                     "customerAddress": ${prop.wan.ip-address},