fix generate template alias resolution

Author: haberkornsam

generate_templates.py

@@ -452,6 +452,7 @@ def resolve_alias(devicemap, sku_map):
         except KeyError:
             pass
 
+    alias_map.update(devicemap)
     return alias_map
 
 def lookup_devicemap(vendor, sku, sku_map):

templates/Juniper-SSR120-AE-template.json

@@ -1,12 +1,12 @@
 {
   "name": "Juniper-SSR400-CW-Template",
-  "description": "Adds a standalone Juniper SSR400-CW router: Juniper SSR400-W - 10 ethernet + WiFi",
+  "description": "Adds a standalone Juniper SSR400-CW router: Juniper SSR400-CW - 10 ethernet + 5G + WiFi",
   "enabled": true,
   "persistInput": false,
   "builtin": true,
   "mode": "advanced",
-  "help": "# Juniper SSR400-CW Router\n\nThis adds a basic Juniper SSR400-CW Session Smart Router to your configuration.\n\n\n\n\n##Generate Config\nSelect the generate config icon at the top of the page, and proceed to configuration. Validate and commit to finish adding the new router to running configuration.\n\n## Port Details\nThis template assumes all WAN interfaces on your device will be connected to a network providing it DHCP address assignment, and with connectivity to your conductor.\n\nIt will configure LAN interfaces providing a DHCP server to connected endpoints. From the LAN, the router local GUI and CLI will be accessible at `192.168.128.1`\n\n",
-  "body": "{% editgroup %}\n\n{\n  \"authority\": {\n    \"security\": [\n      {\n        \"name\": \"internal-encrypt-hmac-disable\",\n        \"description\": \"Security policy built by builtin router template\",\n        \"encrypt\": \"false\",\n        \"adaptiveEncryption\": \"false\",\n        \"hmacMode\": \"disabled\"\n      }\n    ],\n    \"router\": [\n      {\n        \"_value\": {\n          \"name\": \"{{routerName}}\",\n          \"description\": \"{{routerDescription}}\",\n          \"location\": \"{{routerLocation}}\",\n          \"interNodeSecurity\": \"internal-encrypt-hmac-disable\",\n          \"system\": {\n            \"ntp\": {\n              \"server\": [\n                {\n                  \"ipAddress\": \"216.239.35.0\"\n                },\n                {\n                  \"ipAddress\": \"216.239.35.4\"\n                },\n                {\n                  \"ipAddress\": \"216.239.35.8\"\n                },\n                {\n                  \"ipAddress\": \"216.239.35.12\"\n                }\n              ]\n            }\n          },\n          \"dnsConfig\": [\n            {\n              \"mode\": \"static\",\n              \"address\": [\n                \"1.1.1.1\",\n                \"8.8.8.8\"\n              ]\n            }\n          ],\n          \"applicationIdentification\": {\n            \"mode\": [\n              \"all\"\n            ]\n          },\n          \"node\": [\n            {\n              \"name\": \"node1\",\n              \"role\": \"combo\",\n              \"description\": \"{{routerName}} router node\",\n              \"deviceInterface\": []\n            }\n          ]\n        },\n        \"_operation\": \"create\"\n      }\n    ]\n  }\n}",
+  "help": "# Juniper SSR400-CW Router\n\nThis adds a basic Juniper SSR400-CW Session Smart Router to your configuration.\nLTE is available on your platform.\n\n\n\n##Generate Config\nSelect the generate config icon at the top of the page, and proceed to configuration. Validate and commit to finish adding the new router to running configuration.\n\n## Port Details\nThis template assumes all WAN interfaces on your device will be connected to a network providing it DHCP address assignment, and with connectivity to your conductor.\n\nIt will configure LAN interfaces providing a DHCP server to connected endpoints. From the LAN, the router local GUI and CLI will be accessible at `192.168.128.1`\n\n",
+  "body": "{% editgroup %}\n\n{\n  \"authority\": {\n    \"security\": [\n      {\n        \"name\": \"internal-encrypt-hmac-disable\",\n        \"description\": \"Security policy built by builtin router template\",\n        \"encrypt\": \"false\",\n        \"adaptiveEncryption\": \"false\",\n        \"hmacMode\": \"disabled\"\n      }\n    ],\n    \"router\": [\n      {\n        \"_value\": {\n          \"name\": \"{{routerName}}\",\n          \"description\": \"{{routerDescription}}\",\n          \"location\": \"{{routerLocation}}\",\n          \"interNodeSecurity\": \"internal-encrypt-hmac-disable\",\n          \"system\": {\n            \"ntp\": {\n              \"server\": [\n                {\n                  \"ipAddress\": \"216.239.35.0\"\n                },\n                {\n                  \"ipAddress\": \"216.239.35.4\"\n                },\n                {\n                  \"ipAddress\": \"216.239.35.8\"\n                },\n                {\n                  \"ipAddress\": \"216.239.35.12\"\n                }\n              ]\n            }\n          },\n          \"dnsConfig\": [\n            {\n              \"mode\": \"static\",\n              \"address\": [\n                \"1.1.1.1\",\n                \"8.8.8.8\"\n              ]\n            }\n          ],\n          \"applicationIdentification\": {\n            \"mode\": [\n              \"all\"\n            ]\n          },\n          \"node\": [\n            {\n              \"name\": \"node1\",\n              \"role\": \"combo\",\n              \"description\": \"{{routerName}} router node\",\n              \"deviceInterface\": [\n                {\n                  \"name\": \"lte-0-0\",\n                  \"description\": \"LTE device interface\",\n                  \"type\": \"lte\",\n                  \"enabled\": \"true\",\n                  \"forwarding\": \"true\",\n                  \"targetInterface\": \"TBD\",\n                  \"networkInterface\": [\n                    {\n                      \"name\": \"lte-0-0\",\n                      \"description\": \"\",\n                      \"sourceNat\": \"true\",\n                      \"management\": \"false\",\n                      \"defaultRoute\": \"false\",\n                      \"managementVector\": {\n                        \"priority\": \"200\",\n                        \"name\": \"mgmt\"\n                      },\n                      \"dhcp\": \"v4\"\n                    }\n                  ]\n                }\n              ]\n            }\n          ]\n        },\n        \"_operation\": \"create\"\n      }\n    ]\n  }\n}",
   "schema": {
     "type": "object",
     "definitions": {
@@ -156,7 +156,13 @@
         "type": "object",
         "title": "Ports",
         "description": "Port and network settings.",
-        "properties": {}
+        "properties": {
+          "lte-0-0": {
+            "title": "WAN - lte-0-0",
+            "description": "LTE device interface",
+            "$ref": "#/definitions/wanPort"
+          }
+        }
       }
     }
   }

templates/Juniper-SSR130-AE-template.json

@@ -1,6 +1,6 @@
 {
   "name": "Juniper-SSR440-C-Template",
-  "description": "Adds a standalone Juniper SSR440-C router: Juniper SSR400-C - 10 ethernet + 5G",
+  "description": "Adds a standalone Juniper SSR440-C router: Juniper SSR440-C - 10 ethernet + 5G",
   "enabled": true,
   "persistInput": false,
   "builtin": true,