Make some changes to create a larger merge conflict

twin-bridges · Mar 8, 2024 · 02709db · 02709db
1 parent 78fa218
commit 02709db
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/ip_addresses.txt b/ip_addresses.txt
@@ -1,10 +1,12 @@
 172.16.0.1/22
 172.16.4.1/22
 172.16.8.1/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.30.1.1/30
 172.31.1.1/24
 172.31.2.1/24

diff --git a/netmiko_conn.py b/netmiko_conn.py
@@ -6,6 +6,14 @@
     "username": "juniper",
     "password": "juniper123!",
 }
+rtr2 = {
+    "device_type": "juniper_junos",
+    "host": "rtr2.domain.com",
+    "username": "juniper",
+    "password": "juniper123!",
+}
 
-with ConnectHandler(**rtr1) as net_connect:
-    output = net_connect.send_command("show version")
+for device in (rtr1, rtr2):
+    with ConnectHandler(**device) as net_connect:
+        output = net_connect.send_command("show version")
+        print(output)
diff --git a/nornir.yaml b/nornir.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/sites.yaml b/sites.yaml
@@ -4,3 +4,5 @@
 - sfo1
 - den1
 - den2
+- dal1
+- dal2
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,5 @@ @@
     - sfo1
     - den1
     - den2
+    - dal1
+    - dal2