Split ec2_elb_* modules in service of rename/interface changes (#30532)

* Undeprecate ec2_elb_*
* Make ec2_elb* full fledged modules rather than aliases
* Split tests for ec2_elb_lb and elb_classicb_lb
* Change names in documentation of old and new elb modules

Add tests for ec2_elb_lb

test/integration/targets/ec2_elb_lb/aliases

@@ -0,0 +1,2 @@
+cloud/aws
+posix/ci/cloud/group1/aws

test/integration/targets/ec2_elb_lb/defaults/main.yml

@@ -0,0 +1,3 @@
+---
+# defaults file for test_ec2_eip
+tag_prefix: '{{resource_prefix}}'

test/integration/targets/ec2_elb_lb/meta/main.yml

@@ -0,0 +1,3 @@
+dependencies:
+  - prepare_tests
+  - setup_ec2

test/integration/targets/ec2_elb_lb/tasks/main.yml

@@ -0,0 +1,419 @@
+---
+# __Test Info__
+# Create a self signed cert and upload it to AWS
+# http://www.akadia.com/services/ssh_test_certificate.html
+# http://docs.aws.amazon.com/ElasticLoadBalancing/latest/DeveloperGuide/ssl-server-cert.html
+
+# __Test Outline__
+#
+# __ec2_elb_lb__
+# create test elb with listeners and certificate
+# change AZ's
+# change listeners
+# remove listeners
+# remove elb
+
+# __ec2-common__
+# test environment variable EC2_REGION
+# test with no parameters
+# test with only instance_id
+# test invalid region parameter
+# test valid region parameter
+# test invalid ec2_url parameter
+# test valid ec2_url parameter
+# test credentials from environment
+# test credential parameters
+
+- block:
+
+    # ============================================================
+    # create test elb with listeners, certificate, and health check
+
+    - name: Create ELB
+      ec2_elb_lb:
+        name: "{{ tag_prefix }}"
+        region: "{{ ec2_region }}"
+        ec2_access_key: "{{ ec2_access_key }}"
+        ec2_secret_key: "{{ ec2_secret_key }}"
+        security_token: "{{ security_token }}"
+        state: present
+        zones:
+          - us-east-1c
+          - us-east-1d
+        listeners:
+          - protocol: http
+            load_balancer_port: 80
+            instance_port: 80
+          - protocol: http
+            load_balancer_port: 8080
+            instance_port: 8080
+        health_check:
+            ping_protocol: http
+            ping_port: 80
+            ping_path: "/index.html"
+            response_timeout: 5
+            interval: 30
+            unhealthy_threshold: 2
+            healthy_threshold: 10
+      register: info
+
+    - assert:
+        that:
+          - 'info.changed'
+          - 'info.elb.status == "created"'
+          - '"us-east-1c" in info.elb.zones'
+          - '"us-east-1d" in info.elb.zones'
+          - 'info.elb.health_check.healthy_threshold == 10'
+          - 'info.elb.health_check.interval == 30'
+          - 'info.elb.health_check.target == "HTTP:80/index.html"'
+          - 'info.elb.health_check.timeout == 5'
+          - 'info.elb.health_check.unhealthy_threshold == 2'
+          - '[80, 80, "HTTP", "HTTP"] in info.elb.listeners'
+          - '[8080, 8080, "HTTP", "HTTP"] in info.elb.listeners'
+
+    # ============================================================
+
+    # check ports, would be cool, but we are at the mercy of AWS
+    # to start things in a timely manner
+
+    #- name: check to make sure 80 is listening
+    #  wait_for: host={{ info.elb.dns_name }} port=80 timeout=600
+    #  register: result
+
+    #- name: assert can connect to port#
+    #  assert: 'result.state == "started"'
+
+    #- name: check to make sure 443 is listening
+    #  wait_for: host={{ info.elb.dns_name }} port=443 timeout=600
+    #  register: result
+
+    #- name: assert can connect to port#
+    #  assert: 'result.state == "started"'
+
+    # ============================================================
+
+    # Change AZ's
+
+    - name: Change AZ's
+      ec2_elb_lb:
+        name: "{{ tag_prefix }}"
+        region: "{{ ec2_region }}"
+        ec2_access_key: "{{ ec2_access_key }}"
+        ec2_secret_key: "{{ ec2_secret_key }}"
+        security_token: "{{ security_token }}"
+        state: present
+        zones:
+          - us-east-1b
+        listeners:
+          - protocol: http
+            load_balancer_port: 80
+            instance_port: 80
+        purge_zones: yes
+        health_check:
+            ping_protocol: http
+            ping_port: 80
+            ping_path: "/index.html"
+            response_timeout: 5
+            interval: 30
+            unhealthy_threshold: 2
+            healthy_threshold: 10
+      register: info
+
+
+
+    - assert:
+        that:
+          - 'info.elb.status == "ok"'
+          - 'info.changed'
+          - 'info.elb.zones[0] == "us-east-1b"'
+
+    # ============================================================
+
+    # Update AZ's
+
+    - name: Update AZ's
+      ec2_elb_lb:
+        name: "{{ tag_prefix }}"
+        region: "{{ ec2_region }}"
+        ec2_access_key: "{{ ec2_access_key }}"
+        ec2_secret_key: "{{ ec2_secret_key }}"
+        security_token: "{{ security_token }}"
+        state: present
+        zones:
+          - us-east-1b
+          - us-east-1c
+          - us-east-1d
+        listeners:
+          - protocol: http
+            load_balancer_port: 80
+            instance_port: 80
+        purge_zones: yes
+      register: info
+
+    - assert:
+        that:
+          - 'info.changed'
+          - 'info.elb.status == "ok"'
+          - '"us-east-1b" in info.elb.zones'
+          - '"us-east-1c" in info.elb.zones'
+          - '"us-east-1d" in info.elb.zones'
+
+
+    # ============================================================
+
+    # Purge Listeners
+
+    - name: Purge Listeners
+      ec2_elb_lb:
+        name: "{{ tag_prefix }}"
+        region: "{{ ec2_region }}"
+        ec2_access_key: "{{ ec2_access_key }}"
+        ec2_secret_key: "{{ ec2_secret_key }}"
+        security_token: "{{ security_token }}"
+        state: present
+        zones:
+          - us-east-1b
+          - us-east-1c
+          - us-east-1d
+        listeners:
+          - protocol: http
+            load_balancer_port: 80
+            instance_port: 81
+        purge_listeners: yes
+      register: info
+
+    - assert:
+        that:
+          - 'info.elb.status == "ok"'
+          - 'info.changed'
+          - '[80, 81, "HTTP", "HTTP"] in info.elb.listeners'
+          - 'info.elb.listeners|length == 1'
+
+
+
+    # ============================================================
+
+    # add Listeners
+
+    - name: Add Listeners
+      ec2_elb_lb:
+        name: "{{ tag_prefix }}"
+        region: "{{ ec2_region }}"
+        ec2_access_key: "{{ ec2_access_key }}"
+        ec2_secret_key: "{{ ec2_secret_key }}"
+        security_token: "{{ security_token }}"
+        state: present
+        zones:
+          - us-east-1b
+          - us-east-1c
+          - us-east-1d
+        listeners:
+          - protocol: http
+            load_balancer_port: 8081
+            instance_port: 8081
+        purge_listeners: no
+      register: info
+
+    - assert:
+        that:
+          - 'info.elb.status == "ok"'
+          - 'info.changed'
+          - '[80, 81, "HTTP", "HTTP"] in info.elb.listeners'
+          - '[8081, 8081, "HTTP", "HTTP"] in info.elb.listeners'
+          - 'info.elb.listeners|length == 2'
+
+
+    # ============================================================
+
+    - name: test with no parameters
+      ec2_elb_lb:
+      register: result
+      ignore_errors: true
+
+    - name: assert failure when called with no parameters
+      assert:
+        that:
+           - 'result.failed'
+           - 'result.msg.startswith("missing required arguments: ")'
+
+
+
+    # ============================================================
+    - name: test with only name
+      ec2_elb_lb:
+        name="{{ tag_prefix }}"
+      register: result
+      ignore_errors: true
+
+    - name: assert failure when called with only name
+      assert:
+        that:
+           - 'result.failed'
+           - 'result.msg == "missing required arguments: state"'
+
+
+    # ============================================================
+    - name: test invalid region parameter
+      ec2_elb_lb:
+        name: "{{ tag_prefix }}"
+        region: 'asdf querty 1234'
+        state: present
+        listeners:
+          - protocol: http
+            load_balancer_port: 80
+            instance_port: 80
+        zones:
+          - us-east-1c
+          - us-east-1d
+      register: result
+      ignore_errors: true
+
+    - name: assert invalid region parameter
+      assert:
+        that:
+           - 'result.failed'
+           - 'result.msg.startswith("Region asdf querty 1234 does not seem to be available ")'
+
+
+    # ============================================================
+    - name: test valid region parameter
+      ec2_elb_lb:
+        name: "{{ tag_prefix }}"
+        region: "{{ ec2_region }}"
+        state: present
+        zones:
+          - us-east-1a
+          - us-east-1d
+        listeners:
+          - protocol: http
+            load_balancer_port: 80
+            instance_port: 80
+
+      register: result
+      ignore_errors: true
+
+    - name: assert valid region parameter
+      assert:
+        that:
+           - 'result.failed'
+           - 'result.msg.startswith("No handler was ready to authenticate.")'
+
+
+    # ============================================================
+
+    - name: test invalid ec2_url parameter
+      ec2_elb_lb:
+        name: "{{ tag_prefix }}"
+        region: "{{ ec2_region }}"
+        state: present
+        zones:
+          - us-east-1a
+          - us-east-1d
+        listeners:
+          - protocol: http
+            load_balancer_port: 80
+            instance_port: 80
+      environment:
+        EC2_URL: bogus.example.com
+      register: result
+      ignore_errors: true
+
+    - name: assert invalid ec2_url parameter
+      assert:
+        that:
+           - 'result.failed'
+           - 'result.msg.startswith("No handler was ready to authenticate.")'
+
+
+    # ============================================================
+    - name: test valid ec2_url parameter
+      ec2_elb_lb:
+        name: "{{ tag_prefix }}"
+        region: "{{ ec2_region }}"
+        state: present
+        zones:
+          - us-east-1a
+          - us-east-1d
+        listeners:
+          - protocol: http
+            load_balancer_port: 80
+            instance_port: 80
+      environment:
+        EC2_URL: '{{ec2_url}}'
+      register: result
+      ignore_errors: true
+
+    - name: assert valid ec2_url parameter
+      assert:
+        that:
+           - 'result.failed'
+           - 'result.msg.startswith("No handler was ready to authenticate.")'
+
+
+    # ============================================================
+    - name: test credentials from environment
+      ec2_elb_lb:
+        name: "{{ tag_prefix }}"
+        region: "{{ ec2_region }}"
+        state: present
+        zones:
+          - us-east-1a
+          - us-east-1d
+        listeners:
+          - protocol: http
+            load_balancer_port: 80
+            instance_port: 80
+      environment:
+        EC2_ACCESS_KEY: bogus_access_key
+        EC2_SECRET_KEY: bogus_secret_key
+      register: result
+      ignore_errors: true
+
+    - name: assert credentials from environment
+      assert:
+        that:
+           - 'result.failed'
+           - '"InvalidClientTokenId" in result.exception'
+
+
+    # ============================================================
+    - name: test credential parameters
+      ec2_elb_lb:
+        name: "{{ tag_prefix }}"
+        region: "{{ ec2_region }}"
+        state: present
+        zones:
+          - us-east-1a
+          - us-east-1d
+        listeners:
+          - protocol: http
+            load_balancer_port: 80
+            instance_port: 80
+      register: result
+      ignore_errors: true
+
+    - name: assert credential parameters
+      assert:
+        that:
+           - 'result.failed'
+           - '"No handler was ready to authenticate. 1 handlers were checked." in result.msg'
+
+  always:
+
+    # ============================================================
+    - name: remove the test load balancer completely
+      ec2_elb_lb:
+        name: "{{ tag_prefix }}"
+        region: "{{ ec2_region }}"
+        state: absent
+        ec2_access_key: "{{ ec2_access_key }}"
+        ec2_secret_key: "{{ ec2_secret_key }}"
+        security_token: "{{ security_token }}"
+      register: result
+
+    - name: assert the load balancer was removed
+      assert:
+        that:
+           - 'result.changed'
+           - 'result.elb.name == "{{tag_prefix}}"'
+           - 'result.elb.status == "deleted"'

test/integration/targets/ec2_elb_lb/vars/main.yml

@@ -0,0 +1,2 @@
+---
+# vars file for test_ec2_elb_lb

test/integration/targets/elb_classic_lb/tasks/main.yml

@@ -6,7 +6,7 @@
 
 # __Test Outline__
 #
-# __ec2_elb_lb__
+# __elb_classic_lb__
 # create test elb with listeners and certificate
 # change AZ's
 # change listeners
@@ -30,7 +30,7 @@
     # create test elb with listeners, certificate, and health check
 
     - name: Create ELB
-      ec2_elb_lb:
+      elb_classic_lb:
         name: "{{ tag_prefix }}"
         region: "{{ ec2_region }}"
         ec2_access_key: "{{ ec2_access_key }}"
@@ -95,7 +95,7 @@
     # Change AZ's
 
     - name: Change AZ's
-      ec2_elb_lb:
+      elb_classic_lb:
         name: "{{ tag_prefix }}"
         region: "{{ ec2_region }}"
         ec2_access_key: "{{ ec2_access_key }}"
@@ -132,7 +132,7 @@
     # Update AZ's
 
     - name: Update AZ's
-      ec2_elb_lb:
+      elb_classic_lb:
         name: "{{ tag_prefix }}"
         region: "{{ ec2_region }}"
         ec2_access_key: "{{ ec2_access_key }}"
@@ -164,7 +164,7 @@
     # Purge Listeners
 
     - name: Purge Listeners
-      ec2_elb_lb:
+      elb_classic_lb:
         name: "{{ tag_prefix }}"
         region: "{{ ec2_region }}"
         ec2_access_key: "{{ ec2_access_key }}"
@@ -196,7 +196,7 @@
     # add Listeners
 
     - name: Add Listeners
-      ec2_elb_lb:
+      elb_classic_lb:
         name: "{{ tag_prefix }}"
         region: "{{ ec2_region }}"
         ec2_access_key: "{{ ec2_access_key }}"
@@ -226,7 +226,7 @@
     # ============================================================
 
     - name: test with no parameters
-      ec2_elb_lb:
+      elb_classic_lb:
       register: result
       ignore_errors: true
 
@@ -240,7 +240,7 @@
 
     # ============================================================
     - name: test with only name
-      ec2_elb_lb:
+      elb_classic_lb:
         name="{{ tag_prefix }}"
       register: result
       ignore_errors: true
@@ -254,7 +254,7 @@
 
     # ============================================================
     - name: test invalid region parameter
-      ec2_elb_lb:
+      elb_classic_lb:
         name: "{{ tag_prefix }}"
         region: 'asdf querty 1234'
         state: present
@@ -277,7 +277,7 @@
 
     # ============================================================
     - name: test valid region parameter
-      ec2_elb_lb:
+      elb_classic_lb:
         name: "{{ tag_prefix }}"
         region: "{{ ec2_region }}"
         state: present
@@ -302,7 +302,7 @@
     # ============================================================
 
     - name: test invalid ec2_url parameter
-      ec2_elb_lb:
+      elb_classic_lb:
         name: "{{ tag_prefix }}"
         region: "{{ ec2_region }}"
         state: present
@@ -327,7 +327,7 @@
 
     # ============================================================
     - name: test valid ec2_url parameter
-      ec2_elb_lb:
+      elb_classic_lb:
         name: "{{ tag_prefix }}"
         region: "{{ ec2_region }}"
         state: present
@@ -352,7 +352,7 @@
 
     # ============================================================
     - name: test credentials from environment
-      ec2_elb_lb:
+      elb_classic_lb:
         name: "{{ tag_prefix }}"
         region: "{{ ec2_region }}"
         state: present
@@ -378,7 +378,7 @@
 
     # ============================================================
     - name: test credential parameters
-      ec2_elb_lb:
+      elb_classic_lb:
         name: "{{ tag_prefix }}"
         region: "{{ ec2_region }}"
         state: present
@@ -402,7 +402,7 @@
 
     # ============================================================
     - name: remove the test load balancer completely
-      ec2_elb_lb:
+      elb_classic_lb:
         name: "{{ tag_prefix }}"
         region: "{{ ec2_region }}"
         state: absent