Fixing larger merge conflict

twin-bridges · Mar 8, 2024 · debafa8 · debafa8
2 parents 6616d85 + 02709db
commit debafa8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/config.yaml b/config.yaml
@@ -3,9 +3,9 @@ inventory:
   plugin: SimpleInventory
 
 runner:
-  plugin: threaded
-  options:
-    num_workers: 10
+  plugin: serial
+  # options:
+  #  num_workers: 10
 
 logging:
   log_file: nornir.out
diff --git a/ip_addresses.txt b/ip_addresses.txt
@@ -2,10 +2,12 @@
 172.16.4.1/22
 172.16.8.1/22
 172.16.8.2/22
-172.16.12.1/22
 172.18.0.1/22
 172.18.4.1/22
 172.18.8.1/22
+172.19.0.1/21
+172.19.8.1/21
+172.19.16.1/21
 172.29.1.1/24
 172.30.1.1/30
 172.31.1.1/24

diff --git a/netmiko_conn.py b/netmiko_conn.py
@@ -6,7 +6,15 @@
     "username": "juniper",
     "password": "juniper123!",
 }
+rtr2 = {
+    "device_type": "juniper_junos",
+    "host": "rtr2.domain.com",
+    "username": "juniper",
+    "password": "juniper123!",
+}
 
-# Establish Netmiko Connection and execute simple 'show' command
-with ConnectHandler(**rtr1) as net_connect:
-    output = net_connect.send_command("show version")
+for device in (rtr1, rtr2):
+    # Establish Netmiko Connection and execute simple 'show' command
+    with ConnectHandler(**device) as net_connect:
+        output = net_connect.send_command("show version")
+        print(output)
diff --git a/sites.yaml b/sites.yaml
@@ -0,0 +1,8 @@
+---
+- lax1
+- lax2
+- sfo1
+- den1
+- den2
+- dal1
+- dal2
-Original file line number
+Diff line change
@@ -0,0 +1,8 @@
+    ---
+    - lax1
+    - lax2
+    - sfo1
+    - den1
+    - den2
+    - dal1
+    - dal2