Merge remote-tracking branch 'downstream' into downstream

awx/main/utils/licensing.py

@@ -134,7 +134,10 @@ class Licenser(object):
         # Parse output for subscription metadata to build config
         license = dict()
         license['sku'] = manifest['pool']['productId']
-        license['instance_count'] = manifest['pool']['quantity']
+        try:
+            license['instance_count'] = manifest['pool']['exported']
+        except KeyError:
+            license['instance_count'] = manifest['pool']['quantity']
         license['subscription_name'] = manifest['pool']['productName']
         license['pool_id'] = manifest['pool']['id']
         license['license_date'] = parse_date(manifest['endDate']).strftime('%s')

awx/ui/client/src/license/license.partial.html

@@ -112,7 +112,7 @@
 							<div class="License-subTitleText">
 								<span class="Form-requiredAsterisk">*</span>
 								<translate>Red Hat Subscription Manifest</translate>
-								<a aria-label="{{'Show help text' | translate}}" id="subscription-manifest-popover" href="" aw-pop-over="A subscription manifest is an export of a Red Hat Subscription. To generate a subscription manifest, go to <a href=https://access.redhat.com/management/subscription_allocations target=_blank>access.redhat.com</a>.<br>For more information, see the <a href=https://docs.ansible.com/ansible-tower/latest/html/userguide/import_license.html>User Guide</a>.</translate>" data-placement="top" data-container="body" over-title="Subscription Manifest" class="help-link">
+								<a aria-label="{{'Show help text' | translate}}" id="subscription-manifest-popover" href="" aw-pop-over="{{'A subscription manifest is an export of a Red Hat Subscription. To generate a subscription manifest, go to <a href=https://access.redhat.com/management/subscription_allocations target=_blank>access.redhat.com</a>.<br>For more information, see the <a href=https://docs.ansible.com/ansible-tower/latest/html/userguide/import_license.html>User Guide</a>.' | translate}}" data-placement="top" data-container="body" over-title="Subscription Manifest" class="help-link">
 									<i class="fa fa-question-circle"></i>
 								</a>
 							</div>

awx_collection/plugins/modules/tower_credential.py

@@ -74,7 +74,7 @@ options:
         - Deprecated, please use credential_type
       required: False
       type: str
-      choices: ["aws", "tower", "gce", "azure_rm", "openstack", "cloudforms", "satellite6", "rhv", "vmware", "aim", "conjur", "hashivault_kv", "hashivault_ssh",
+      choices: ["aws", "tower", "gce", "azure_rm", "openstack", "satellite6", "rhv", "vmware", "aim", "conjur", "hashivault_kv", "hashivault_ssh",
                 "azure_kv", "insights", "kubernetes_bearer_token", "net", "scm", "ssh", "github_token", "gitlab_token", "vault"]
     host:
       description:
@@ -284,7 +284,6 @@ KIND_CHOICES = {
     'gce': 'Google Compute Engine',
     'azure_rm': 'Microsoft Azure Resource Manager',
     'openstack': 'OpenStack',
-    'cloudforms': 'Red Hat CloudForms',
     'satellite6': 'Red Hat Satellite 6',
     'rhv': 'Red Hat Virtualization',
     'vmware': 'VMware vCenter',

awx_collection/test/awx/test_inventory_source.py

@@ -182,18 +182,18 @@ def test_falsy_value(run_module, admin_user, base_inventory):
 # We want to let the API return issues with "this doesn't support that", etc.
 #
 # GUI OPTIONS:
-# - - - - - - - manual:	file:	scm:	ec2:	gce	azure_rm	vmware	sat	cloudforms	openstack	rhv	tower	custom
-# credential		?	?	o	o	r	r		r	r	r		r		r	r	o
-# source_project	?	?	r	-	-	-		-	-	-		-		-	-	-
-# source_path		?	?	r	-	-	-		-	-	-		-		-	-	-
-# verbosity			?	?	o	o	o	o		o	o	o		o		o	o	o
-# overwrite			?	?	o	o	o	o		o	o	o		o		o	o	o
-# overwrite_vars	?	?	o	o	o	o		o	o	o		o		o	o	o
-# update_on_launch	?	?	o	o	o	o		o	o	o		o		o	o	o
-# UoPL          	?	?	o	-	-	-		-	-	-		-		-	-	-
-# source_vars*		?	?	-	o	-	o		o	o	o		o		-	-	-
-# environmet vars*	?	?	o	-	-	-		-	-	-		-		-	-	o
-# source_script		?	?	-	-	-	-		-	-	-		-		-	-	r
+# - - - - - - - manual:	file:	scm:	ec2:	gce	azure_rm	vmware	sat	openstack	rhv	tower	custom
+# credential		?	?	o	o	r	r		r	r		r		r	r	o
+# source_project	?	?	r	-	-	-		-	-		-		-	-	-
+# source_path		?	?	r	-	-	-		-	-		-		-	-	-
+# verbosity			?	?	o	o	o	o		o	o		o		o	o	o
+# overwrite			?	?	o	o	o	o		o	o		o		o	o	o
+# overwrite_vars	?	?	o	o	o	o		o	o		o		o	o	o
+# update_on_launch	?	?	o	o	o	o		o	o		o		o	o	o
+# UoPL          	?	?	o	-	-	-		-	-		-		-	-	-
+# source_vars*		?	?	-	o	-	o		o	o		o		-	-	-
+# environmet vars*	?	?	o	-	-	-		-	-		-		-	-	o
+# source_script		?	?	-	-	-	-		-	-		-		-	-	r
 #
 # UoPL - update_on_project_launch
 # * - source_vars are labeled environment_vars on project and custom sources

awx_collection/tests/integration/targets/tower_credential/tasks/main.yml

@@ -17,7 +17,6 @@
     aws_cred_name1: "AWX-Collection-tests-tower_credential-aws-cred1-{{ test_id }}"
     vmware_cred_name1: "AWX-Collection-tests-tower_credential-vmware-cred1-{{ test_id }}"
     sat6_cred_name1: "AWX-Collection-tests-tower_credential-sat6-cred1-{{ test_id }}"
-    cf_cred_name1: "AWX-Collection-tests-tower_credential-cf-cred1-{{ test_id }}"
     gce_cred_name1: "AWX-Collection-tests-tower_credential-gce-cred1-{{ test_id }}"
     azurerm_cred_name1: "AWX-Collection-tests-tower_credential-azurerm-cred1-{{ test_id }}"
     openstack_cred_name1: "AWX-Collection-tests-tower_credential-openstack-cred1-{{ test_id }}"
@@ -534,33 +533,6 @@
     that:
       - "result is changed"
 
-- name: Create a valid CloudForms credential
-  tower_credential:
-    name: "{{ cf_cred_name1 }}"
-    organization: Default
-    state: present
-    kind: cloudforms
-    host: https://example.org
-    username: joe
-    password: secret
-  register: result
-
-- assert:
-    that:
-      - "result is changed"
-
-- name: Delete a CloudForms credential
-  tower_credential:
-    name: "{{ cf_cred_name1 }}"
-    organization: Default
-    state: absent
-    kind: cloudforms
-  register: result
-
-- assert:
-    that:
-      - "result is changed"
-
 - name: Create a valid GCE credential
   tower_credential:
     name: "{{ gce_cred_name1 }}"