diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-05-13 18:07:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-13 18:07:08 +0000 |
| commit | 39a3fe544a8539cf500560db6b1d2fa2e51ff46a (patch) | |
| tree | 3051cd1f6a0f6c91e1cd6b31af9bf8d81e68590e | |
| parent | 3fca8160d489542a3c1057b8694380159407240c (diff) | |
| parent | bd8befcd781b1c26f2f5c63e4f0c950dad9c3931 (diff) | |
Merge "Fix SDWAN restapi templates"
Former-commit-id: 22b464b4470f0b29359672ccd79731d5acf15ed3
6 files changed, 9 insertions, 9 deletions
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 85ccf15a..504be835 100644 --- 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 a871f114..e2b99032 100644 --- 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 6161b1bd..5f85aa22 100644 --- 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 11412b41..f1192a22 100644 --- 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 58cf7969..3f07b600 100644 --- 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 9825b6e6..ce9d4f2b 100644 --- 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}, |