Misc Curriculum Updates for Antidote 0.7

images/crpd/Dockerfile

@@ -1,4 +1,4 @@
-FROM crpd:20.1R1.11
+FROM crpd:20.2R1.10
 
 ADD launch.sh /
 ADD sshd_config /

images/crpd/Makefile

@@ -5,8 +5,8 @@ TARGET_VERSION ?= latest
 all: docker
 
 docker:
-	gsutil cp "gs://nrelabs-curriculum-base-images/crpd/junos-routing-crpd-docker-20.1R1.11.tgz" "./junos-routing-crpd-docker-20.1R1.11.tgz"
-	docker load -i junos-routing-crpd-docker-20.1R1.11.tgz
+	gsutil cp "gs://nrelabs-curriculum-base-images/crpd/junos-routing-crpd-docker-20.2R1.10.tgz" "./crpd.tgz"
+	docker load -i crpd.tgz
 
 	docker build --no-cache -t antidotelabs/crpd:$(TARGET_VERSION) .
 	docker push antidotelabs/crpd:$(TARGET_VERSION)

images/stackstorm/.welcome.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 
 # Get st2 version based on hardcoded string in st2common
-ST2_VERSION=$(/opt/stackstorm/st2/bin/python -c 'execfile("/opt/stackstorm/st2/lib/python2.7/site-packages/st2common/__init__.py"); print __version__')
-printf "Welcome to \033[1;38;5;208mStackStorm\033[0m \033[1m%s\033[0m (Ubuntu 16.04 LTS %s %s)\n" "v${ST2_VERSION}" "$(uname -o)" "$(uname -m)"
+. /etc/lsb-release 
+ST2_VERSION=$(/opt/stackstorm/st2/bin/python -c 'exec(open("/opt/stackstorm/st2/lib/python3.6/site-packages/st2common/__init__.py").read()); print(__version__)')
+printf "Welcome to \033[1;38;5;208mStackStorm\033[0m \033[1m%s\033[0m (${DISTRIB_DESCRIPTION} %s %s)\n" "v${ST2_VERSION}" "$(uname -o)" "$(uname -m)"
 printf " * Documentation: https://docs.stackstorm.com/\n"
 printf " * Community: https://stackstorm.com/community-signup\n"
 printf " * Forum: https://forum.stackstorm.com/\n"

images/stackstorm/Dockerfile

@@ -1,10 +1,10 @@
-FROM ubuntu:xenial
+FROM ubuntu:bionic
 
 # Lovingly borrowed and modified from https://github.com/StackStorm/st2-dockerfiles/blob/master/base/Dockerfile
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-ARG ST2_VERSION=2.10.1
+ARG ST2_VERSION=3.2.0
 RUN : "${ST2_VERSION:?Docker build argument needs to be set and non-empty.}"
 
 ENV container docker
@@ -13,7 +13,7 @@ ENV TERM xterm
 
 # Generate and set locale to UTF-8
 RUN apt-get -qq update \
-  && apt-get install -y \
+  && apt-get install -y gnupg wget \
     curl \
     locales \
   && rm -rf /var/lib/apt/lists/* \
@@ -28,18 +28,20 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 #####################################################################################################
 
 RUN mkdir -p /data/db
-RUN apt-get update
-RUN apt-get install -y gnupg-curl
-RUN apt-get install -y curl wget
 
-# Add key and repo for the latest stable MongoDB (3.4)
-RUN wget -qO - https://www.mongodb.org/static/pgp/server-3.4.asc | apt-key add -
-RUN echo "deb http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.4 multiverse" > /etc/apt/sources.list.d/mongodb-org-3.4.list
+
+
+# Add key and repo for MongoDB (4.0)
+RUN wget -qO - https://www.mongodb.org/static/pgp/server-4.0.asc | apt-key add -
+RUN echo "deb http://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse"  > /etc/apt/sources.list.d/mongodb-org-4.0.list
 RUN apt-get update
 
-RUN apt-get install -y crudini
-RUN apt-get install -y mongodb-org
-RUN apt-get install -y rabbitmq-server
+# # Add key and repo for the latest stable MongoDB (3.4)
+# RUN wget -qO - https://www.mongodb.org/static/pgp/server-3.4.asc | apt-key add -
+# RUN echo "deb http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.4 multiverse" > /etc/apt/sources.list.d/mongodb-org-3.4.list
+# RUN apt-get update
+
+RUN apt-get install -y crudini mongodb-org rabbitmq-server
 
 #####################################################################################################
 ## Install StackStorm                 
@@ -55,22 +57,26 @@ RUN curl -sf https://packagecloud.io/install/repositories/StackStorm/stable/scri
 ADD htpasswd /etc/st2/htpasswd
 
 RUN echo "stanley:stanley" | chpasswd
-ADD start_st2_services.sh /
+ADD start_st2_services.sh start_st2_services_and_ssh.sh /
 
 #####################################################################################################
 ## Additional installations / configuration             
 #####################################################################################################
 
 RUN apt-get update && apt-get install -y openssh-server python git vim screen
 ADD napalm.yaml /opt/stackstorm/configs
-RUN cp -r /usr/share/doc/st2/examples/ /opt/stackstorm/packs/
+
+# For some reason, in 3.x, /usr/share/doc/st2/examples/ is empty other than the directory structure. So I'm doing this to get
+# the examples pack.
+RUN git clone -b v${ST2_VERSION} https://github.com/StackStorm/st2 && cp -r st2/contrib/examples/ /opt/stackstorm/packs/
+RUN ls -lha /opt/stackstorm/packs/examples/actions/workflows/
+
 ARG CACHEBUST=1
-RUN screen -d -m /start_st2_services.sh && sleep 15 \
+RUN /start_st2_services.sh && sleep 15 \
     && st2ctl reload --register-all \
     && st2 run packs.setup_virtualenv packs=examples \ 
     && st2 pack remove napalm && st2 pack install https://github.com/nre-learning/stackstorm-napalm.git
-RUN /opt/stackstorm/virtualenvs/napalm/bin/pip install ncclient==0.6.0
-RUN /opt/stackstorm/virtualenvs/napalm/bin/pip install --upgrade netmiko==2.4.2
+
 ARG CACHEBUST=0
 
 #####################################################################################################
@@ -108,4 +114,4 @@ RUN echo "auth required pam_wheel.so use_uid" >> /etc/pam.d/su
 ENV NOTVISIBLE "in users profile"
 RUN echo "export VISIBLE=now" >> /etc/profile
 
-CMD /start_st2_services.sh
+CMD /start_st2_services_and_ssh.sh

images/stackstorm/napalm.yaml

@@ -12,11 +12,3 @@ devices:
   port: 22
   driver: junos
   credentials: junosdevices
-- hostname: vqfx2
-  port: 22
-  driver: junos
-  credentials: junosdevices
-- hostname: vqfx3
-  port: 22
-  driver: junos
-  credentials: junosdevices

images/stackstorm/start_st2_services.sh

@@ -1,18 +1,17 @@
 #!/bin/bash
 
 
-screen -d -t mongodb -m /usr/bin/mongod
-screen -d -t rabbitmq -m rabbitmq-server
+/usr/bin/mongod &
+rabbitmq-server &
 sleep 10
-screen -d -t st2actionrunner -m /opt/stackstorm/st2/bin/st2actionrunner --config-file=/etc/st2/st2.conf
-screen -d -t st2api -m /opt/stackstorm/st2/bin/st2api --config-file=/etc/st2/st2.conf
-screen -d -t st2auth -m /opt/stackstorm/st2/bin/st2auth --config-file=/etc/st2/st2.conf
-screen -d -t st2notifier -m /opt/stackstorm/st2/bin/st2notifier --config-file=/etc/st2/st2.conf
-screen -d -t st2rulesengine -m /opt/stackstorm/st2/bin/st2rulesengine --config-file=/etc/st2/st2.conf
-screen -d -t st2scheduler -m /opt/stackstorm/st2/bin/st2scheduler --config-file=/etc/st2/st2.conf
-screen -d -t st2sensorcontainer -m /opt/stackstorm/st2/bin/st2sensorcontainer --config-file=/etc/st2/st2.conf
-screen -d -t st2stream -m /opt/stackstorm/st2/bin/st2stream --config-file=/etc/st2/st2.conf
-screen -d -t st2timersengine -m /opt/stackstorm/st2/bin/st2timersengine --config-file=/etc/st2/st2.conf
-screen -d -t st2workflowengine -m /opt/stackstorm/st2/bin/st2workflowengine --config-file=/etc/st2/st2.conf
+/opt/stackstorm/st2/bin/st2actionrunner --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2api --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2auth --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2notifier --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2rulesengine --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2scheduler --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2sensorcontainer --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2stream --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2timersengine --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2workflowengine --config-file=/etc/st2/st2.conf &
 
-/usr/sbin/sshd -D

images/stackstorm/start_st2_services_and_ssh.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+
+/usr/bin/mongod &
+rabbitmq-server &
+sleep 10
+/opt/stackstorm/st2/bin/st2actionrunner --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2api --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2auth --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2notifier --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2rulesengine --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2scheduler --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2sensorcontainer --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2stream --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2timersengine --config-file=/etc/st2/st2.conf &
+/opt/stackstorm/st2/bin/st2workflowengine --config-file=/etc/st2/st2.conf &
+
+/usr/sbin/sshd -D

images/utility/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:18.04
 
-RUN apt-get update && apt-get install -y openssh-server python python-pip dnsutils iputils-ping git vim curl util-linux sshpass nano jq libxml2-utils
+RUN apt-get update && apt-get install -y openssh-server python3 python3-pip dnsutils iputils-ping git vim curl util-linux sshpass nano jq libxml2-utils
 RUN mkdir /var/run/sshd
 
 # Antidote user
@@ -31,16 +31,16 @@ ENV NOTVISIBLE "in users profile"
 RUN echo "export VISIBLE=now" >> /etc/profile
 
 ADD requirements.txt /requirements.txt
-RUN pip install -r /requirements.txt
+RUN pip3 install -r /requirements.txt
 
 # The snapshots directory is apparently not being set up during installation so we'll do it here
 RUN mkdir -p /home/antidote/jsnapy/snapshots && chown -R antidote:antidote /home/antidote/jsnapy
 
-# Temporary fix to get NAPALM working. Long-term we should convert utility to use python 3
-RUN pip install --upgrade netmiko==2.4.2
-
 RUN curl -L -o yq https://github.com/mikefarah/yq/releases/download/3.3.2/yq_linux_amd64 && chmod +x yq && mv yq /usr/local/bin
 RUN wget https://github.com/sharkdp/bat/releases/download/v0.15.4/bat_0.15.4_amd64.deb && dpkg -i bat_0.15.4_amd64.deb
 
+COPY bash_profile /home/antidote/.bash_profile
+RUN chown antidote:antidote /home/antidote/.bash_profile
+
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]

images/utility/Makefile

@@ -5,6 +5,5 @@ TARGET_VERSION ?= latest
 all: docker
 
 docker:
-	# docker build --pull --no-cache -t antidotelabs/utility:$(TARGET_VERSION) .
-	docker build --pull -t antidotelabs/utility:$(TARGET_VERSION) .
+	docker build --pull --no-cache -t antidotelabs/utility:$(TARGET_VERSION) .
 	docker push antidotelabs/utility:$(TARGET_VERSION)

images/utility/bash_profile

@@ -0,0 +1 @@
+alias python="/usr/bin/python3"

lessons/config-backup-automated/stage0/guide.md

@@ -25,7 +25,7 @@ dev.open()
 Then we will use the `rpc.get_config` function to pull the device configuration and store it in a variable called `config`. Next we `write` the configuration to the local file and finally `close` the local file.
 <pre>
 config = dev.rpc.get_config(options={'format':'set'})
-outfile.write(etree.tostring(config))
+outfile.write(etree.tostring(config).decode("utf-8"))
 outfile.close()
 </pre>
 <button type="button" class="btn btn-primary btn-sm" onclick="runSnippetInTab('linux1', this)">Run this snippet</button>

lessons/config-backup-automated/stage1/guide.md

@@ -27,7 +27,7 @@ deviceList = yaml.full_load(deviceFile)
 
 To ensure the `devices.yml` file was processed correctly we can print the `deviceList` variable.
 <pre>
-print deviceList
+print(deviceList)
 </pre>
 <button type="button" class="btn btn-primary btn-sm" onclick="runSnippetInTab('linux1', this)">Run this snippet</button>
 
@@ -42,7 +42,7 @@ for device in deviceList:
 	dev.open()
 	outfile = open(device + "-backup.txt","w")
 	config = dev.rpc.get_config(options={'format':'text'})
-	outfile.write(etree.tostring(config))
+	outfile.write(etree.tostring(config).decode("utf-8"))
 	outfile.close()
 
 </pre>

lessons/napalm-multi-vendor-network-automation/stage0/configs/vqfx1-junos.txt

@@ -81,20 +81,7 @@
                 </providers>
             </extensions>
         </system>
-        <interfaces operation="replace">
-            <interface>
-                <name>em0</name>
-                <unit>
-                    <name>0</name>
-                    <family>
-                        <inet>
-                            <address>
-                                <name>{{ mgmt_addr }}</name>
-                            </address>
-                        </inet>
-                    </family>
-                </unit>
-            </interface>
+        <interfaces operation="merge">
             <interface>
                 <name>em1</name>
                 <unit>

lessons/napalm-multi-vendor-network-automation/stage1/configs/vqfx1-junos.txt

@@ -81,20 +81,7 @@
                 </providers>
             </extensions>
         </system>
-        <interfaces operation="replace">
-            <interface>
-                <name>em0</name>
-                <unit>
-                    <name>0</name>
-                    <family>
-                        <inet>
-                            <address>
-                                <name>{{ mgmt_addr }}</name>
-                            </address>
-                        </inet>
-                    </family>
-                </unit>
-            </interface>
+        <interfaces operation="merge">
             <interface>
                 <name>em1</name>
                 <unit>

lessons/napalm-multi-vendor-network-automation/stage2/configs/vqfx1-junos.txt

@@ -81,20 +81,7 @@
                 </providers>
             </extensions>
         </system>
-        <interfaces operation="replace">
-            <interface>
-                <name>em0</name>
-                <unit>
-                    <name>0</name>
-                    <family>
-                        <inet>
-                            <address>
-                                <name>{{ mgmt_addr }}</name>
-                            </address>
-                        </inet>
-                    </family>
-                </unit>
-            </interface>
+        <interfaces operation="merge">
             <interface>
                 <name>em1</name>
                 <unit>

lessons/napalm-multi-vendor-network-automation/stage3/configs/vqfx1-junos.txt

@@ -81,20 +81,7 @@
                 </providers>
             </extensions>
         </system>
-        <interfaces operation="replace">
-            <interface>
-                <name>em0</name>
-                <unit>
-                    <name>0</name>
-                    <family>
-                        <inet>
-                            <address>
-                                <name>{{ mgmt_addr }}</name>
-                            </address>
-                        </inet>
-                    </family>
-                </unit>
-            </interface>
+        <interfaces operation="merge">
             <interface>
                 <name>em1</name>
                 <unit>

lessons/pyez-junos-automation/stage0/configs/vqfx-junos.txt

@@ -82,19 +82,6 @@
             </extensions>
         </system>
         <interfaces operation="merge">
-            <interface>
-                <name>em0</name>
-                <unit>
-                    <name>0</name>
-                    <family>
-                        <inet>
-                            <address>
-                                <name>{{ mgmt_addr }}</name>
-                            </address>
-                        </inet>
-                    </family>
-                </unit>
-            </interface>
             <interface>
                 <name>em3</name>
                 <unit>

lessons/pyez-junos-automation/stage1/configs/vqfx-junos.txt

@@ -82,19 +82,6 @@
             </extensions>
         </system>
         <interfaces operation="merge">
-            <interface>
-                <name>em0</name>
-                <unit>
-                    <name>0</name>
-                    <family>
-                        <inet>
-                            <address>
-                                <name>{{ mgmt_addr }}</name>
-                            </address>
-                        </inet>
-                    </family>
-                </unit>
-            </interface>
             <interface>
                 <name>em3</name>
                 <unit>

lessons/pyez-junos-automation/stage2/configs/vqfx-junos.txt

@@ -82,19 +82,6 @@
             </extensions>
         </system>
         <interfaces operation="merge">
-            <interface>
-                <name>em0</name>
-                <unit>
-                    <name>0</name>
-                    <family>
-                        <inet>
-                            <address>
-                                <name>{{ mgmt_addr }}</name>
-                            </address>
-                        </inet>
-                    </family>
-                </unit>
-            </interface>
             <interface>
                 <name>em3</name>
                 <unit>