Minor updates to Class 1 and 2 (#187)

* Minor updates to Class 1 and 2

Minor edits including image updates and removal of iWorkflow references.

* Updated for AS3 release 3.2

Updates to lab2 to reflect 3.2 release

* Updates to postman collection

Updated variables and WAF policy deployment for AS3 3.2 release

* Updated Postman Collection

Updates from Forrest for class 1 module 3

* Class 1 - Lab 2 updates

Updated images to reflect correct ASM policy and minor fix to postman
collection Lab 2.3 - Step 9

* Postman collection name change

* Remove iWorkflow reference

Removed iWorkflow reference from conclusion.

* Cleanup build error

Author: chrisadrian001

docs/class1/bigipbasics.rst

@@ -4,14 +4,14 @@ BIG-IP Basics (optional)
 ------------------------
 
 Just in case you're new to the F5 BIG-IP platform (or need a refresher) we've
-included some links and videos below that will help get you started.  
+included some links and videos below that will help get you started.
 
 What is BIG-IP
 ^^^^^^^^^^^^^^
 
 .. raw:: html
 
-    <iframe width="600" height="315" src="http://www.youtube.com/embed/D6J_j7HdkV8?rel=0" frameborder="0" gesture="media" allowfullscreen></iframe>
+    <iframe width="600" height="315" src="https://www.youtube.com/embed/D6J_j7HdkV8?rel=0" frameborder="0" gesture="media" allowfullscreen></iframe>
 
 *Source: https://devcentral.f5.com/articles/lightboard-lessons-what-is-big-ip-26793*
 
@@ -56,7 +56,7 @@ HA Proxy to BIG-IP Quick Start
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 If you're already familiar with HA Proxy, learning F5 BIG-IP is straightforward
-once you learn the associated F5 terminology. 
+once you learn the associated F5 terminology.
 
 Here is a list of common HA Proxy configuration terminology and its F5 equivalent:
 
@@ -84,13 +84,13 @@ NGINX to BIG-IP Quick Start
 If you are already familiar with NGINX, learning F5 BIG-IP will be
 straightforward once you learn the F5 terminology.
 
-NGINX administrators usually use multiple files and leverage the include 
-command in their config to break down the config and make it easier to 
+NGINX administrators usually use multiple files and leverage the include
+command in their config to break down the config and make it easier to
 manage. F5 leverages *Profiles* which can be applied to a *Virtual Server*.
 
-NGINX uses in-band (passive) health monitors which can be enabled on F5 through 
-the creation of an *inband monitor*. BIG-IP also supports the use of active 
-health monitors, which will poll the pool member periodically.  Both can be 
+NGINX uses in-band (passive) health monitors which can be enabled on F5 through
+the creation of an *inband monitor*. BIG-IP also supports the use of active
+health monitors, which will poll the pool member periodically.  Both can be
 used together for better monitoring of your services.
 
 F5 BIG-IP supports control-plane and data-plane programmability with:
@@ -99,13 +99,13 @@ F5 BIG-IP supports control-plane and data-plane programmability with:
 
 - TCL through the use of iRules and iApp Templates
 
-A lot of the manual configuration and scripting steps that are required with NGINX 
+A lot of the manual configuration and scripting steps that are required with NGINX
 are supported more easily through various config parameters and profiles in BIG-IP.
 By leveraging the control-plane programmability features this class covers you can
 achieve full automation of your services with the BIG-IP platform.
 
 F5 BIG-IP is designed to be a full proxy by default.  In most cases there is no
-need to tune TCP & HTTP buffering like you would on NGINX (i.e. using 
+need to tune TCP & HTTP buffering like you would on NGINX (i.e. using
 ``proxy_buffering``).  This is because the default settings have been optimized
 and can adapt to most situations.
 
@@ -135,4 +135,4 @@ Here is a list of common NGINX configuration terminology and its F5 equivalent:
 | location & proxy_pass            | LTM HTTP Policy Option                     |
 +----------------------------------+--------------------------------------------+
 | Proxy Cache                      | Web Acceleration Policy                    |
-+----------------------------------+--------------------------------------------+ 
++----------------------------------+--------------------------------------------+

docs/class1/class1.rst

@@ -5,7 +5,7 @@ This introductory class covers the following topics:
 
 - Imperative Automation using the F5 BIG-IP iControl REST API
 - Service Abstraction and Automation using F5 App Services 3 Extension (AS3)
-- Building Declarative Interfaces with the F5 iWorkflow product
+- Building Declarative Interfaces with AS3 and Ansible Tower
 
 Expected time to complete: **4 hours**
 

docs/class1/conclusion.rst

@@ -19,7 +19,7 @@ Conclusion
             label = "Class 1: Introduction to Automation & Orchestration"
             bigip [label="BIG-IP"]
             iapps [label="iApp Templates\n& Deployments"]
-            iwf [label="iWorkflow Service\nTemplates,\nCatalog & Deployment"]
+            iwf [label="AS3 Templates & Deployment"]
             {
                 rank=same
                 rest_basics [label="REST Basics"]

docs/class1/module1/lab3.rst

@@ -194,7 +194,7 @@ Perform the following steps to change the ``root`` user password:
 
    |lab-3-5|
 
-#. **Repeat the procedure above to change the password back to** ``default``
+#. **Repeat the procedure above to change the password back to** ``default``.
 
 Perform the following steps to change the **admin** user password:
 
@@ -209,7 +209,7 @@ Perform the following steps to change the **admin** user password:
 #. You can verify the password has been changed by opening an SSH session
     OR by logging into TMUI (HTTP GUI) to BIG-IP A in a Chrome browser tab.
 
-#. **Repeat the procedure above to change the password back to** ``admin``
+#. **Repeat the procedure above to change the password back to** ``admin``.
 
 .. |lab-3-1| image:: images/lab-3-1.png
 .. |lab-3-2| image:: images/lab-3-2.png

docs/class1/module1/module1.rst

@@ -46,8 +46,8 @@ focus on demonstrating an **Imperative** approach to automation.
    on a single device due to lab time allocation constraints.
 
 .. NOTE:: In order to confirm the results of REST API calls made in this lab, it's
-   recommended to keep GUI/SSH sessions to BIG-IP and iWorkflow devices open.
-   By default, BIG-IP and iWorkflow will log all the REST API related events locally
+   recommended to keep GUI/SSH sessions to the BIG-IP devices open.
+   By default, BIG-IP will log all the REST API related events locally
    to **restjavad.0.log** . These logs can also be directed to a remote syslog server
    (see https://support.f5.com/csp/article/K13080). On a side note, the **ltm**
    log files listed below contains log messages specific to  BIG-IP local
@@ -59,9 +59,6 @@ focus on demonstrating an **Imperative** approach to automation.
 
      - /var/log/restjavad.0.log
 
-   - iWorkflow:
-
-     - /var/log/restjavad.0.log
 
 .. toctree::
    :maxdepth: 1

docs/class1/module2/images/lab-1-2.png

@@ -25,7 +25,7 @@ Installation
 ~~~~~~~~~~~~
 
 iControl LX Extensions use the common Redhat Package Manager (RPM) distribution
-format.  To install an extension you need to first obtain the RPM file 
+format.  To install an extension you need to first obtain the RPM file
 associated with the extension.
 
 AS3 RPMs are available at https://github.com/f5networks/f5-appsvcs-extension/releases
@@ -40,37 +40,39 @@ All of these mechanisms are supported and, if required, can be used in
 conjunction with each other.
 
 For instance, you can install AS3 from BIG-IP GUI and then deploy
-a new service via iControl REST using tools such as cURL, Postman 
+a new service via iControl REST using tools such as cURL, Postman
 and Ansible.
 
 To view installed iControl LX Extensions in the BIG-IP GUI you must first
 enable this functionality.  To do this, log in via SSH into the system with an ``admin``
-account and execute ``touch /var/config/rest/iapps/enable``. No reboot is required. 
-This will enable the :menuselection:`iApps --> Package Management LX` menu: 
+account and execute ``touch /var/config/rest/iapps/enable``. No reboot is required.
+This will enable the :menuselection:`iApps --> Package Management LX` menu:
 
 |lab-1-1|
 
 Clicking :guilabel:`Package Management LX` will show a table of installed
 iControl LX Extensions:
 
+.. NOTE:: This will be empty until one or more iControl LX Extension packages have been imported.
+
 |lab-1-2|
 
 Deployments
 ~~~~~~~~~~~
 
-.. NOTE:: Redeployment of AS3 services is facilitated/protected by a mechanism 
-   in BIG-IP platform to ensure safe changes to the configurations without 
+.. NOTE:: Redeployment of AS3 services is facilitated/protected by a mechanism
+   in BIG-IP platform to ensure safe changes to the configurations without
    disrupting existing user traffic.
 
-iControl LX allows Extensions to register new REST API endpoints with the 
+iControl LX allows Extensions to register new REST API endpoints with the
 iControl REST API.  In the case of AS3 the following endpoints are exposed:
 
 - **Version Info:** ``/mgmt/shared/appsvcs/info``
 - **Declarations:** ``/mgmt/shared/appsvcs/declare``
 - **Self-Test:** ``/mgmt/shared/appsvcs/selftest``
 
-Deployments use the `/mgmt/shared/appsvcs/declare` endpoint.  This endpoint 
-accepts the Create, Read, Update and Delete (CRUD) operations using the HTTP 
+Deployments use the `/mgmt/shared/appsvcs/declare` endpoint.  This endpoint
+accepts the Create, Read, Update and Delete (CRUD) operations using the HTTP
 ``POST``, ``GET``, ``PATCH`` and ``DELETE`` methods.
 
 Additionally various query parameters are also supported.  Full documentation
@@ -79,18 +81,18 @@ is available in the `AS3 Reference <http://clouddocs.f5.com/products/extensions/
 Source-of-Truth
 ~~~~~~~~~~~~~~~
 
-In an automated environment, we **must** always ensure that the 
-**AS3 declarations** are being used as the Source-of-Truth for an underlying 
-deployment.  Therefore, you should **NOT** perform out-of-band modifications 
+In an automated environment, we **must** always ensure that the
+**AS3 declarations** are being used as the Source-of-Truth for an underlying
+deployment.  Therefore, you should **NOT** perform out-of-band modifications
 to the configuration using the BIG-IP GUI or REST API.
 
 For instance, after an AS3 declaration is deployed, modifying the underlying
-configuration will result in a Source-of-Truth violation.  AS3 **does not** 
-prevent out-of-band changes from occuring.  This allows administrators to ensure 
-total control over the system in emergency situations, however, the direct 
-modification of objects configured on BIG-IP will effect the integrity of 
-AS3 declaration that automation tools are interacting with, causing failures. 
-It is therefore important to prevent out-of-band changes at all times for 
+configuration will result in a Source-of-Truth violation.  AS3 **does not**
+prevent out-of-band changes from occuring.  This allows administrators to ensure
+total control over the system in emergency situations, however, the direct
+modification of objects configured on BIG-IP will effect the integrity of
+AS3 declaration that automation tools are interacting with, causing failures.
+It is therefore important to prevent out-of-band changes at all times for
 automated deployments in normal production circumstances.
 
 .. |lab-1-1| image:: images/lab-1-1.png

docs/class1/module2/images/lab-2-5.png

@@ -35,7 +35,7 @@ Task 1 - View Installed iControl LX Extensions
 
 Perform the following steps to complete this task:
 
-#. :guilabel:`Send` the ``Step 1: Get Installed iControl LX Extensions`` 
+#. :guilabel:`Send` the ``Step 1: Get Installed iControl LX Extensions``
    request to view extensions installed on the BIG-IP device:
 
    |lab-2-2|
@@ -51,21 +51,21 @@ Task 2 - Install the AS3 Extension
 
 Perform the following steps to complete this task:
 
-#. Using the Chrome web browser open a new tab and click the 
-   ``AS 3.1.0 Release`` bookmark.
+#. Using the Chrome web browser open a new tab and click the
+   ``AS3 Release`` bookmark.
 
 #. Click the file with the ``.rpm`` extension to download it.  The file will be
    located in the ``/home/ubuntu/Downloads`` folder on your jumphost.
 
 #. Click the ``Step 2: Upload AS3 Extension RPM`` request.
 
-#. Click the :guilabel:`Body` tab, then click the :guilabel:`Choose Files` 
+#. Click the :guilabel:`Body` tab, then click the :guilabel:`Choose Files`
    button:
 
    |lab-2-4|
 
-#. Select the previously downloaded RPM file located in the ``Downloads`` 
-   folder on your jumphost.  Then click the :guilabel:`Send` button to upload 
+#. Select the previously downloaded RPM file located in the ``Downloads``
+   folder on your jumphost.  Then click the :guilabel:`Send` button to upload
    the RPM file to the BIG-IP system:
 
    |lab-2-5|
@@ -74,9 +74,9 @@ Perform the following steps to complete this task:
 
    |lab-2-6|
 
-#. Click the ``Step 3: Create AS3 Extension Install Task`` request and click 
-   :guilabel:`Send`.  This request will command the iControl LX framework to 
-   install the RPM uploaded in the previous step.  Because the installation 
+#. Click the ``Step 3: Create AS3 Extension Install Task`` request and click
+   :guilabel:`Send`.  This request will command the iControl LX framework to
+   install the RPM uploaded in the previous step.  Because the installation
    task is an asynchronous operation we need to check the status of the task
    in the next step.
 
@@ -88,7 +88,7 @@ Perform the following steps to complete this task:
 
    |lab-2-7|
 
-#. Click the ``Step 5: Get AS3 Version Info`` request and click 
+#. Click the ``Step 5: Get AS3 Version Info`` request and click
    :guilabel:`Send`.  Review the **Response** :guilabel:`Body` to ensure
    the AS3 is installed and has started:
 
@@ -102,4 +102,3 @@ Perform the following steps to complete this task:
 .. |lab-2-6| image:: images/lab-2-6.png
 .. |lab-2-7| image:: images/lab-2-7.png
 .. |lab-2-8| image:: images/lab-2-8.png
-