Merge branch 'master' of github.com:hpreston/netdevops_demos

hpreston · Nov 16, 2022 · 73ab377 · 73ab377
2 parents 617d07d + bd847e0
commit 73ab377
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 61 deletions.
diff --git a/genie-cli-1/README.md b/genie-cli-1/README.md
diff --git a/genie-cli-1/dev/requirements.txt b/genie-cli-1/dev/requirements.txt
@@ -4,7 +4,7 @@ certifi==2019.3.9
 cffi==1.12.2
 chardet==3.0.4
 Click==7.0
-cryptography==2.6.1
+cryptography>=3.2
 dill==0.2.9
 docopt==0.6.2
 Flask==1.0.2
@@ -28,15 +28,15 @@ genie.utils==19.0.1
 gunicorn==19.9.0
 idna==2.8
 itsdangerous==1.1.0
-Jinja2==2.10
+Jinja2>=2.11.3
 jsonpickle==1.1
 junit-xml==1.8
-lxml==4.3.2
+lxml>=4.6.3
 MarkupSafe==1.1.1
 netaddr==0.7.19
 pathspec==0.5.9
 prettytable==0.7.2
-psutil==5.6.1
+psutil>=5.6.6
 pyats==19.0
 pyats.aereport==19.0
 pyats.aetest==19.0.1
@@ -54,15 +54,15 @@ pyats.topology==19.0
 pyats.utils==19.0.1
 pycparser==2.19
 python-dateutil==2.8.0
-PyYAML==5.1
+PyYAML>=5.4
 requests==2.21.0
 setproctitle==1.1.10
 six==1.12.0
 tabulate==0.8.3
 tqdm==4.31.1
 unicon==19.0.1
-urllib3==1.24.1
+urllib3>=1.26.5
 virlutils==0.8.4
-Werkzeug==0.15.1
+werkzeug>=0.15.3
 xmltodict==0.12.0
 yamllint==1.15.0
diff --git a/genie-cli-1/requirements.txt b/genie-cli-1/requirements.txt
@@ -1,2 +1,8 @@
+<<<<<<< HEAD
 pyats>=19.9
 genie>=19.9
+=======
+pyats>=19.0
+genie>=19.0
+markupsafe~=1.1.1
+>>>>>>> bd847e00b580b477f20973114138837b3372547c
diff --git a/genie-cli-1/testbeds/mock_break1_tb.yaml b/genie-cli-1/testbeds/mock_break1_tb.yaml
@@ -2,8 +2,12 @@ testbed:
   name: mock-break1
   credentials: 
     default: 
+<<<<<<< HEAD
       username: blank
       password: blank
+=======
+      username: mock 
+>>>>>>> bd847e00b580b477f20973114138837b3372547c
 
 devices:
 

diff --git a/genie-cli-1/testbeds/mock_break2_tb.yaml b/genie-cli-1/testbeds/mock_break2_tb.yaml
@@ -2,8 +2,12 @@ testbed:
   name: mock-break2
   credentials: 
     default: 
+<<<<<<< HEAD
       username: blank
       password: blank
+=======
+      username: mock 
+>>>>>>> bd847e00b580b477f20973114138837b3372547c
 
 devices:
 

diff --git a/genie-cli-1/testbeds/mock_break3_tb.yaml b/genie-cli-1/testbeds/mock_break3_tb.yaml
@@ -2,8 +2,12 @@ testbed:
   name: mock-break3
   credentials: 
     default: 
+<<<<<<< HEAD
       username: blank
       password: blank
+=======
+      username: mock 
+>>>>>>> bd847e00b580b477f20973114138837b3372547c
 
 devices:
 

diff --git a/genie-cli-1/testbeds/mock_break4_tb.yaml b/genie-cli-1/testbeds/mock_break4_tb.yaml
@@ -2,8 +2,12 @@ testbed:
   name: mock-break4
   credentials: 
     default: 
+<<<<<<< HEAD
       username: blank
       password: blank
+=======
+      username: mock 
+>>>>>>> bd847e00b580b477f20973114138837b3372547c
 
 devices:
 

diff --git a/genie-cli-1/testbeds/mock_break5_tb.yaml b/genie-cli-1/testbeds/mock_break5_tb.yaml
@@ -2,8 +2,12 @@ testbed:
   name: mock-break5
   credentials: 
     default: 
+<<<<<<< HEAD
       username: blank
       password: blank
+=======
+      username: mock 
+>>>>>>> bd847e00b580b477f20973114138837b3372547c
 
 devices:
 

diff --git a/genie-cli-1/testbeds/mock_normal_tb.yaml b/genie-cli-1/testbeds/mock_normal_tb.yaml
@@ -2,8 +2,12 @@ testbed:
   name: mock-normal
   credentials: 
     default: 
+<<<<<<< HEAD
       username: blank
       password: blank
+=======
+      username: mock 
+>>>>>>> bd847e00b580b477f20973114138837b3372547c
 
 devices:
 

diff --git a/genie-examples/explore_vlans.py b/genie-examples/explore_vlans.py
@@ -35,7 +35,7 @@
 device = testbed.devices["sbx-n9kv-ao"]
 
 # Conenct to the device
-device.connect()
+device.connect(learn_hostname=True)
 
 # Learn the vlans using Genie model
 vlans = device.learn("vlan")

diff --git a/genie-examples/testbed.yml b/genie-examples/testbed.yml
@@ -8,16 +8,16 @@ testbed:
       enable: "C1sco12345"
 
 devices:
-  csr1000v-1:
-    os: iosxe
-    type: iosxe
-    connections:
-      defaults:
-        class: unicon.Unicon
-      ssh:
-        protocol: ssh
-        ip: "ios-xe-mgmt-latest.cisco.com"
-        port: "8181"
+  # csr1000v-1:
+  #   os: iosxe
+  #   type: iosxe
+  #   connections:
+  #     defaults:
+  #       class: unicon.Unicon
+  #     ssh:
+  #       protocol: ssh
+  #       ip: "ios-xe-mgmt-latest.cisco.com"
+  #       port: "8181"
 
   sbx-n9kv-ao:
     os: nxos
@@ -33,5 +33,5 @@ devices:
         class: unicon.Unicon
       ssh:
         protocol: ssh
-        ip: "sbx-nxos-mgmt.cisco.com"
-        port: "8181"
+        ip: "sandbox-nxos-1.cisco.com"
+        port: "22"
diff --git a/source-of-truth/requirements.txt b/source-of-truth/requirements.txt
@@ -9,7 +9,7 @@ cffi==1.12.3
 chardet==3.0.4
 Click==7.0
 cookiecutter==1.6.0
-cryptography==2.7
+cryptography>=3.2
 decorator==4.4.0
 dill==0.3.0
 distro==1.4.0
@@ -37,7 +37,7 @@ ipython==7.7.0
 ipython-genutils==0.2.0
 IxNetwork==9.0.1915.16
 jedi==0.15.1
-Jinja2==2.10.1
+Jinja2==2.11.3
 jinja2-time==0.2.0
 jsonpickle==1.2
 junit-xml==1.8
@@ -50,7 +50,7 @@ pickleshare==0.7.5
 poyo==0.5.0
 prettytable==0.7.2
 prompt-toolkit==2.0.9
-psutil==5.6.3
+psutil>=5.6.6
 ptyprocess==0.6.0
 pyats==19.7
 pyats.aereport==19.7
@@ -67,11 +67,11 @@ pyats.tcl==19.7
 pyats.topology==19.7
 pyats.utils==19.7
 pycparser==2.19
-Pygments==2.4.2
+Pygments>=2.4.4
 pynetbox==4.0.6
 pyOpenSSL==19.0.0
 python-dateutil==2.8.0
-PyYAML==5.1.2
+PyYAML>=5.4
 requests==2.22.0
 robotframework==3.1.2
 setproctitle==1.1.10
@@ -80,7 +80,7 @@ tabulate==0.8.3
 tqdm==4.34.0
 traitlets==4.3.2
 unicon==19.7.5
-urllib3==1.25.3
+urllib3>=1.25.5
 wcwidth==0.1.7
 websocket-client==0.56.0
 whichcraft==0.6.0