additional error handling; use path buffers; improve logic

demo/spec/xyz/common/ex.yaml

@@ -1,3 +1,3 @@
 regional:
-    partition: us
-    username: netadmin
+  partition: us
+  username: netadmin

demo/spec/xyz/ex-core-r/common.yaml

@@ -0,0 +1,5 @@
+common:
+  partition: us
+  layer: ex-core-r
+  protocol: ospf
+  uplink: et-0/0/36

demo/spec/xyz/ex-core-r/xyz1.common.yaml

@@ -0,0 +1,2 @@
+zonal:
+  zone: 1

demo/spec/xyz/ex-core-r/xyz2.common.yaml

@@ -0,0 +1,2 @@
+zonal:
+  zone: 2

demo/spec/xyz/ex-edge-r/common.yaml

@@ -0,0 +1,4 @@
+common:
+  layer: ex-edge-r
+  protocol: bgp
+  uplink: et-0/0/0

demo/spec/xyz/ex-edge-r/xyz1.common.yaml

@@ -0,0 +1,2 @@
+zonal:
+  zone: 1

demo/spec/xyz/ex-edge-r/xyz2.common.yaml

@@ -0,0 +1,2 @@
+zonal:
+  zone: 2

demo/spec/xyz/ex-edge-r/xyz5-ex-edge-r101.yaml

@@ -0,0 +1,8 @@
+device:
+  zone: 5
+  hostname: xyz5-ex-edge-r101
+  uplinks:
+    - xe-0/0/1
+    - xe-0/0/2
+    - xe-0/0/3
+    - xe-0/0/4

demo/spec/xyz/ex-edge-r1/common.yaml

@@ -1,4 +0,0 @@
-common:
-    layer: ex-edge-r
-    protocol: bgp
-    uplink: et-0/0/0

demo/spec/xyz/ex-edge-r1/xyz1.common.yaml

@@ -1,2 +0,0 @@
-zonal:
-    zone: 1

demo/spec/xyz/ex-edge-r1/xyz2.common.yaml

@@ -1,2 +0,0 @@
-zonal:
-    zone: 2

demo/spec/xyz/ex-edge-r2/common.yaml

@@ -1,5 +0,0 @@
-common:
-    partition: eu
-    layer: ex-edge-r
-    protocol: ospf
-    uplink: et-0/0/36

demo/spec/xyz/ex-edge-r2/xyz1.common.yaml

@@ -1,2 +0,0 @@
-zonal:
-  az: 1

demo/spec/xyz/ex-edge-r2/xyz2.common.yaml

@@ -1,2 +0,0 @@
-zonal:
-  az: 2

demo/tmpl/ex-core-r

@@ -0,0 +1 @@
+ex-edge-r/

demo/tmpl/ex-edge-r/chassis.tmpl

@@ -1,5 +0,0 @@
-chassis {
-    users {
-        {{ username }};
-    }
-}

demo/tmpl/ex-edge-r/interfaces.tera

@@ -0,0 +1,8 @@
+interfaces {
+{%- set interfaces = uplinks | default(value=[uplink]) %}
+{%- for interace in interfaces %}
+    {{ interace }} {
+        unit 0 family inet dhcp;
+    }
+{%- endfor %}
+}

demo/tmpl/ex-edge-r/interfaces.tmpl

@@ -1,4 +0,0 @@
-interfaces {
-    {{ uplink }} {
-    }
-}

demo/tmpl/ex-edge-r/protocols.tera

@@ -0,0 +1,3 @@
+protocols {
+    {{ protocol }};
+}

demo/tmpl/ex-edge-r/protocols.tmpl

@@ -1,4 +0,0 @@
-protocols {
-    {{ protocol }} {
-    }
-}

demo/tmpl/ex-edge-r/structure.yaml

@@ -1,5 +1,4 @@
 files:
   - system
-  - chassis
   - interfaces
   - protocols

demo/tmpl/ex-edge-r/system.tera

@@ -1,4 +1,8 @@
 system {
     hostname {{ hostname }};
     location "{{ location }}";
+    zone {{ zone }};
+    users {
+      {{ username }};
+    }
 }

demo/tmpl/ex-edge-r/system.tmpl

@@ -1 +0,0 @@
-../common/ex/system.tmpl