From: Dan Timoney <dtimoney@att.com>
Date: Thu, 25 Apr 2019 13:44:26 +0000 (+0000)
Subject: Merge "Fixed vf-module-topology DG with valid request-action"
X-Git-Tag: 1.5.1~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ffdd4b815d64e6337707152470b230f755fd1c15;hp=380f168c3df419861c404c5cf5b019548cfdca57;p=sdnc%2Foam.git

Merge "Fixed vf-module-topology DG with valid request-action"

Former-commit-id: 8e1a5cefb9b8892854aa11dbf48174adc259835f
---

diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-port-cellular.json b/platform-logic/restapi-templates/src/main/json/sdwan-port-cellular.json
new file mode 100644
index 00000000..b274c1bf
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-port-cellular.json
@@ -0,0 +1,18 @@
+{
+    "ports": [
+        {
+            "portType": ${prop.wan.portType},
+            "portNumber": ${prop.wan.portNumber},
+            "deviceId": ${prop.wan.deviceId},
+            "portSwitch": "layer3-port",
+            "linkInfo": {
+                 "linkType": "Cellular",
+                 "cellular": {
+                     "apn" : ${prop.wan.apn-name}
+                 },
+                 "atm": null,
+                 "ethernet": null                 
+            }
+        }
+    ]
+}
diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-port-ethernet.json b/platform-logic/restapi-templates/src/main/json/sdwan-port-ethernet.json
new file mode 100644
index 00000000..d24cf4f1
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-port-ethernet.json
@@ -0,0 +1,21 @@
+{
+    "ports": [
+        {
+            "portType": ${prop.wan.portType},
+            "portNumber": ${prop.wan.portNumber},
+            "deviceId": ${prop.wan.deviceId},
+            "portSwitch": "layer3-port",
+            "linkInfo": {
+                 "linkType": "Ethernet",
+                 "cellular": null,
+                 "atm": null,
+                 "ethernet": {
+                      "negotiationMode": "auto",
+                      "media": "copper",
+                      "duplex": "half",
+                      "speed": 10
+                 }
+            }
+        }
+    ]
+}
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
new file mode 100644
index 00000000..58cf7969
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-dhcp.json
@@ -0,0 +1,45 @@
+{
+    "tnps": [
+        {
+            "name": ${prop.wan.name},
+            "siteId": ${prop.wan.siteId},
+            "deviceId": ${prop.wan.deviceId},
+            "portId": ${prop.wan.devicePortId},
+            "inSubInterface": false,
+            "vlanId": "null",            
+            "ipConnection": {
+                "ipv4": {
+                    "publicIP": null,
+                    "accessType": "IPoE",
+                    "ipMode": "DHCP",
+                    "customerAddress": "",
+                    "prefixLength": null,
+                    "providerAddress": "",
+                    "peerIp": null,
+                    "userName": null,
+                    "userKey": null
+                }
+             },
+             "transportNetworkInfo": {
+                 "transportNetworkId": ${prop.wan.transportNetworkId},
+                 "workMode": "active"
+             },
+            "attributes": {
+                "inputBandwidth": ${prop.wan.inputBandwidth},
+                "outputBandwidth": ${prop.wan.outputBandwidth},
+                "mtu": 1500,
+                "TCPmss": 1200
+            },
+			"ntp": [
+              {
+                "serverIP": "11.11.11.11",
+                "authentication": false,
+                "mode": "MD5",
+                "authKey": "123456",
+                "authId": 123
+              }
+            ],
+            "description": ${prop.wan.description}
+        }
+    ]
+}
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
new file mode 100644
index 00000000..9825b6e6
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-static.json
@@ -0,0 +1,45 @@
+{
+    "tnps": [
+        {
+            "name": ${prop.wan.name},
+            "siteId": ${prop.wan.siteId},
+            "deviceId": ${prop.wan.deviceId},
+            "portId": ${prop.wan.devicePortId},
+            "inSubInterface": false,
+            "vlanId": "null",            
+            "ipConnection": {
+                "ipv4": {
+                    "publicIP": null,
+                    "accessType": "IPoE",
+                    "ipMode": "Static",
+                    "customerAddress": ${prop.wan.ip-address},
+                    "prefixLength": ${prop.wan.prefixLength},
+                    "providerAddress": ${prop.wan.providerIpAddress},
+		    "peerIp": null,
+                    "userName": null,
+                    "userKey": null
+                }
+             },
+             "transportNetworkInfo": {
+                 "transportNetworkId": ${prop.wan.transportNetworkId},
+                 "workMode": "active"
+             },
+            "attributes": {
+                "inputBandwidth": ${prop.wan.inputBandwidth},
+                "outputBandwidth": ${prop.wan.outputBandwidth},
+                "mtu": 1500,
+                "TCPmss": 1200
+            },
+			"ntp": [
+              {
+                "serverIP": "11.11.11.11",
+                "authentication": false,
+                "mode": "MD5",
+                "authKey": "123456",
+                "authId": 123
+              }
+            ],
+            "description": ${prop.wan.description}
+        }
+    ]
+}