ficed merge conflicts

Author: OliElli

host_vars/cisco_ios-00.yml

@@ -2495,8 +2495,7 @@ vars:
         start: 0
         transport:
           input:
-            protocols:
-            - ssh
+            protocols: ssh
       5to15:
         escape_character: BREAK
         exec_timeout:
@@ -2510,8 +2509,7 @@ vars:
         start: 5
         transport:
           input:
-            protocols:
-            - ssh
+            protocols: ssh
   logging:
     facility: local6
     hosts:

parsers/cisco_ios/banners/main.yml

@@ -5,7 +5,7 @@
   - name: banner
     template: banners/default.j2
     lines:
-    - regex: '^banner (\w+) (.+)$'
+    - regex: '^banner (\w+) (\^C|.+).*$'
       exmaples:
       - 'banner exec ^C'
       captures:

parsers/cisco_ios/interface/main.yml

@@ -145,6 +145,25 @@
             "{{ name }}":
               switchport:
                 mode: "{{ mode.split() }}"
+      - regex: '^ switchport voice vlan (\d{1,4})$'
+        examples:
+        - ' switchport voice vlan 1200'
+        captures:
+        - vlan
+        path:
+          interfaces:
+            "{{ name }}":
+              switchport:
+                voice:
+                  vlan: "{{ vlan }}"
+      - regex: '^ power inline police$'
+        examples:
+        - ' power inline police'
+        path:
+          interfaces:
+            "{{ name }}":
+              power:
+                inline: "police"
       - regex: '^ channel-group (\d{1,3}) mode (.*)$'
         examples:
         - ' channel-group 1 mode desirable'
@@ -206,6 +225,28 @@
               ip:
                 helper_addresses:
                 - ipv4_helper_address: "{{ ipv4_helper_address }}"
+      - regex: '^ ip access-group (.+) (in|out)$'
+        examples:
+        - ' ip access-group 10 in'
+        captures:
+        - acl_id
+        - direction
+        path:
+          interfaces:
+            "{{ name }}":
+              ip:
+                access_group:
+                - direction: "{{ direction }}"
+                  acl_id: "{{ acl_id }}"
+      - regex: '^ no ip route-cache$'
+        examples:
+        - ' no ip route-cache'
+        path:
+          interfaces:
+            "{{ name }}":
+              ip:
+                route_cache:
+                  negate: True
       - regex: '^ ip route-cache (\w+)$'
         examples:
         - ' ip route-cache policy'

parsers/cisco_ios/vlan/main.yml

@@ -13,3 +13,29 @@
       path:
         vlan:
           internal_allocation_policy: "{{ direction }}"
+  - name: vlans
+    template: vlan/vlan_list.j2
+    lines:
+    - regex: '^vlan (\d+)-?(\d+)?$'
+      examples:
+      - 'vlan 10'
+      captures:
+      - number
+      - end_range
+      path:
+        vlan:
+          vlan_list:
+            "{{ number }}":
+              number: "{{ number }}"
+              end_range: "{{ end_range }}"
+      lines:
+      - regex: '^ name (\S+)$'
+        examples:
+        - ' name users'
+        captures:
+        - name
+        path:
+          vlan:
+            vlan_list:
+              "{{ number }}":
+                name: "{{ name }}"

runparse.py

@@ -146,6 +146,10 @@ def get_configurations():
         device['working_configuration'] = device['configuration']
         devices.append(device)
         print_log('ok', 'ok')
+        """ Create the host_vars automatically for each configuration loaded. Assumes Cisco IOS. """
+        host_vars_path = 'host_vars/'+device_config.rstrip('.svn')+'.yml'
+        host_vars_file_to_create = open(host_vars_path,'w')
+        host_vars_file_to_create.write('os: cisco_ios')
     return devices
 
 def ensure_host_vars(devices, src_dir):

templates/cisco_ios/interface/default.j2

@@ -39,6 +39,11 @@
 {% if 'mode' in vars['interfaces'][interface]['switchport'] %}
   - " switchport mode {{ vars['interfaces'][interface]['switchport']['mode']|join(' ') }}"
 {% endif %} #mode
+{% if 'voice' in vars['interfaces'][interface]['switchport'] %}
+{% if 'vlan' in vars['interfaces'][interface]['switchport']['voice'] %}
+  - " switchport voice vlan {{ vars['interfaces'][interface]['switchport']['voice']['vlan'] }}"
+{% endif %} #vlan
+{% endif %} #voice
 {% if 'negate' in vars['interfaces'][interface]['switchport'] and vars['interfaces'][interface]['switchport']['negate'] %}
   - " no switchport"
 {% endif %} #negate
@@ -89,7 +94,16 @@
 {% endfor %}
 {% endif %} #access_group
 {% if 'route_cache' in vars['interfaces'][interface]['ip'] %}
+{% if 'access_group' in vars['interfaces'][interface]['ip'] %}
+{% for access_group in vars['interfaces'][interface]['ip']['access_group'] %}
+  - " ip access-group {{ access_group['acl_id'] }} {{ access_group['direction'] }}"
+{% endfor %}
+{% endif %} #access-group
+{% if 'negate' in vars['interfaces'][interface]['ip']['route_cache'] %}
+  - " no ip route-cache"
+{% else %}
   - " ip route-cache {{ vars['interfaces'][interface]['ip']['route_cache'] }}"
+{% endif %} #route-cache-negate
 {% endif %} #route-cache
 {% if 'no_route_cache' in vars['interfaces'][interface]['ip'] %}
   - " no ip route-cache"
@@ -104,6 +118,13 @@
 {% if 'shutdown' in vars['interfaces'][interface] and vars['interfaces'][interface]['shutdown'] %}
   - " shutdown"
 {% endif %} #shutdown
+{% if 'power' in vars['interfaces'][interface] %}
+{% if 'inline' in vars['interfaces'][interface]['power'] %}
+{% if 'police' in vars['interfaces'][interface]['power']['inline'] %}
+  - " power inline police"
+{% endif %} #police
+{% endif %} #inline
+{% endif %} #power
 {% if 'negotiation' in vars['interfaces'][interface] and vars['interfaces'][interface]['negotiation']['negate'] %}
   - " no negotiation {{ vars['interfaces'][interface]['negotiation']['type'] }}"
 {% endif %} #no negotiation
@@ -114,7 +135,7 @@
   - " ip pim {{ vars['interfaces'][interface]['ip']['pim']['mode'] }}"
 {% endif %} #pim mode
 {% if 'service_policies' in vars['interfaces'][interface] %}
-{% for service_policy in vars['interfaces'][interface]['service_policies'] %}
+{% for service_policy in vars['interfaces'][interface] %}
   - " service-policy {{ service_policy['direction'] }} {{ service_policy['name'] }}"
 {% endfor %} # helpers
 {% endif %} #helper_addresses

templates/cisco_ios/ip/name-server.j2

@@ -1,5 +1,5 @@
-- parents:
-  lines:
 {% for name_server in vars['ip']['name-servers'] %}
+- parents:
   - 'ip name-server {{ name_server['name_server'] }}'
+  lines:
 {% endfor %}

templates/cisco_ios/line/con_aux.j2

@@ -4,12 +4,18 @@
 - parents:
   - line {{ vars['line'][entry]['type'] }} {{ vars['line'][entry]['numbers'][number]['number'] }}
   lines:
+{% if 'logging_synchronous' in vars['line'][entry]['numbers'][number] %}
+  - " logging synchronous"
+{% endif %}
 {% if 'exec_timeout' in vars['line'][entry]['numbers'][number] %}
   - " exec-timeout {{ vars['line'][entry]['numbers'][number]['exec_timeout']['minutes'] }} {{ vars['line'][entry]['numbers'][number]['exec_timeout']['seconds'] }}"
 {% endif %}
 {% if 'password' in vars['line'][entry]['numbers'][number] %}
   - " password {{ vars['line'][entry]['numbers'][number]['password']['encryption_type'] }} {{ vars['line'][entry]['numbers'][number]['password']['password'] }}"
 {% endif %}
+{% if 'login' in vars['line'][entry]['numbers'][number] and 'local' in vars['line'][entry]['numbers'][number]['login'] %}
+  - " login local"
+{% endif %}
 {% if 'login' in vars['line'][entry]['numbers'][number] and 'authentication' in vars['line'][entry]['numbers'][number]['login'] %}
   - " login authentication {{ vars['line'][entry]['numbers'][number]['login']['authentication'] }}"
 {% endif %}

templates/cisco_ios/line/vty.j2

@@ -2,6 +2,15 @@
 - parents:
   - line vty {{ vars['line']['vty'][num]['start'] }} {{ vars['line']['vty'][num]['finish'] }}
   lines:
+{% if 'access_class' in vars['line']['vty'][num] %}
+  - " access-class {{ vars['line']['vty'][num]['access_class']['acl_id'] }} {{ vars['line']['vty'][num]['access_class']['direction'] }}"
+{% endif %}
+{% if 'logging_synchronous' in vars['line']['vty'][num] %}
+  - " logging synchronous"
+{% endif %}
+{% if 'login_local' in vars['line']['vty'][num] %}
+  - " login local"
+{% endif %}
 {% if 'exec_timeout' in vars['line']['vty'][num] %}
   - " exec-timeout {{ vars['line']['vty'][num]['exec_timeout']['minutes'] }} {{ vars['line']['vty'][num]['exec_timeout']['seconds'] }}"
 {% endif %}
@@ -12,9 +21,15 @@
   - " password {{ vars['line']['vty'][num]['password']['encryption_type'] }} {{ vars['line']['vty'][num]['password']['password'] }}"
 {% endif %}
 {% if 'transport' in vars['line']['vty'][num] %}
-{% for direction in vars['line']['vty'][num]['transport'] %}
-  - " transport {{ direction }} {{ vars['line']['vty'][num]['transport'][direction]['protocols']|join(' ') }}"
-{% endfor %}
+{% if 'preferred' in vars['line']['vty'][num]['transport'] %}
+  - " transport preferred {{ vars['line']['vty'][num]['transport']['preferred']['protocols'] }}"
+{% endif %}
+{% if 'input' in vars['line']['vty'][num]['transport'] %}
+  - " transport input {{ vars['line']['vty'][num]['transport']['input']['protocols'] }}"
+{% endif %}
+{% if 'output' in vars['line']['vty'][num][transport] %}
+  - " transport preferred {{ vars['line']['vty'][num][transport]['output']['protocols'] }}"
+{% endif %}
 {% endif %}
 {% if 'escape_character' in vars['line']['vty'][num] %}
   - " escape-character {{ vars['line']['vty'][num]['escape_character'] }}"

templates/cisco_ios/vlan/vlan_list.j2

@@ -0,0 +1,12 @@
+{% for vlan in vars['vlan']['vlan_list']|sort %}
+- parents:
+{% if vars['vlan']['vlan_list'][vlan]['end_range'] != 0 %}
+  - vlan {{ vlan }}-{{ vars['vlan']['vlan_list'][vlan]['end_range'] }}
+{% else %}
+  - vlan {{ vlan }}
+{% endif %}
+  lines:
+{% if 'name' in vars['vlan']['vlan_list'][vlan] %}
+  - " name {{ vars['vlan']['vlan_list'][vlan]['name'] }}"
+{% endif %}
+{% endfor %}