Merge "Add list of extensions in tempest.conf and ipv6, ipv6_subnet_attributes make True."
diff --git a/runtest/salttest/modules/openstack/barbican.sls b/runtest/salttest/modules/openstack/barbican.sls
new file mode 100644
index 0000000..4d9ebd6
--- /dev/null
+++ b/runtest/salttest/modules/openstack/barbican.sls
@@ -0,0 +1,110 @@
+{%- set secret_name = 'salttest_secret' %}
+{%- set secret_payload = salt['hashutil.base64_b64encode']('My_SaltTest_Payload') %}
+barbicanv1_secret_create:
+ module.run:
+ - name: barbicanv1.secret_create
+ - kwargs:
+ name: {{ secret_name }}
+ secret_type: passphrase
+ cloud_name: admin_identity
+
+barbicanv1_secret_list:
+ module.run:
+ - name: barbicanv1.secret_list
+ - kwargs:
+ cloud_name: admin_identity
+ - require:
+ - barbicanv1_secret_create
+
+barbicanv1_secret_get_details:
+ module.run:
+ - name: barbicanv1.secret_get_details
+ - args:
+ - {{ secret_name }}
+ - kwargs:
+ cloud_name: admin_identity
+ - require:
+ - barbicanv1_secret_create
+
+barbicanv1_secret_payload_set:
+ module.run:
+ - name: barbicanv1.secret_payload_set
+ - args:
+ - {{ secret_name }}
+ - kwargs:
+ payload: {{ secret_payload }}
+ payload_content_type: application/octet-stream
+ payload_content_encoding: base64
+ cloud_name: admin_identity
+ - require:
+ - barbicanv1_secret_create
+
+barbicanv1_secret_payload_get:
+ module.run:
+ - name: barbicanv1.secret_payload_get
+ - args:
+ - {{ secret_name }}
+ - kwargs:
+ cloud_name: admin_identity
+ - require:
+ - barbicanv1_secret_payload_set
+
+barbicanv1_secret_acl_put:
+ module.run:
+ - name: barbicanv1.secret_acl_put
+ - args:
+ - {{ secret_name }}
+ - kwargs:
+ users:
+ - 27f9ecd3656c494cb563cc58072db213
+ - abd3aeb1ab7c441cb2fc80eccd916a4c
+ project-access: True
+ cloud_name: admin_identity
+ - require:
+ - barbicanv1_secret_payload_get
+
+barbicanv1_secret_acl_get:
+ module.run:
+ - name: barbicanv1.secret_acl_get
+ - args:
+ - {{ secret_name }}
+ - kwargs:
+ cloud_name: admin_identity
+ - require:
+ - barbicanv1_secret_acl_put
+
+barbicanv1_secret_acl_patch:
+ module.run:
+ - name: barbicanv1.secret_acl_patch
+ - args:
+ - {{ secret_name }}
+ - kwargs:
+ users:
+ - 27f9ecd3656c494cb563cc58072db213
+ project-access: False
+ cloud_name: admin_identity
+ - require:
+ - barbicanv1_secret_acl_get
+
+barbicanv1_secret_acl_delete:
+ module.run:
+ - name: barbicanv1.secret_acl_delete
+ - args:
+ - {{ secret_name }}
+ - kwargs:
+ users:
+ - 27f9ecd3656c494cb563cc58072db213
+ project-access: False
+ cloud_name: admin_identity
+ - require:
+ - barbicanv1_secret_acl_get
+
+barbicanv1_secret_delete:
+ module.run:
+ - name: barbicanv1.secret_delete
+ - args:
+ - {{ secret_name }}
+ - kwargs:
+ cloud_name: admin_identity
+ - require:
+ - barbicanv1_secret_acl_delete
diff --git a/runtest/salttest/modules/openstack/glancev2.sls b/runtest/salttest/modules/openstack/glancev2.sls
new file mode 100644
index 0000000..3a53605
--- /dev/null
+++ b/runtest/salttest/modules/openstack/glancev2.sls
@@ -0,0 +1,57 @@
+{%- set image_name = 'TestImage' %}
+{%- set image_properties = "[{'op':'add', 'path':'/test_property', 'value': 'test'},]" %}
+glancev2_image_create:
+ module.run:
+ - name: glancev2.image_create
+ - kwargs:
+ container_format: bare
+ disk_format: qcow2
+ name: {{ image_name }}
+ cloud_name: admin_identity
+
+glancev2_image_list:
+ module.run:
+ - name: glancev2.image_list
+ - kwargs:
+ cloud_name: admin_identity
+ - require:
+ - glancev2_image_create
+
+glancev2_image_get_details:
+ module.run:
+ - name: glancev2.image_get_details
+ - args:
+ - {{ image_name }}
+ - kwargs:
+ cloud_name: admin_identity
+ - require:
+ - glancev2_image_list
+
+glancev2_image_update:
+ module.run:
+ - name: glancev2.image_update
+ - args:
+ - {{ image_name }}
+ - {{ image_properties }}
+ - kwargs:
+ cloud_name: admin_identity
+ - require:
+ - glancev2_image_get_details
+
+glancev2_image_delete:
+ module.run:
+ - name: glancev2.image_delete
+ - args:
+ - {{ image_name }}
+ - kwargs:
+ cloud_name: admin_identity
+ - require:
+ - glancev2_image_update
+
+glancev2_task_list:
+ module.run:
+ - name: glancev2.task_list
+ - kwargs:
+ cloud_name: admin_identity
+ - require:
+ - glancev2_image_delete
diff --git a/runtest/salttest/modules/openstack/init.sls b/runtest/salttest/modules/openstack/init.sls
index 9e591a9..f2e0c47 100644
--- a/runtest/salttest/modules/openstack/init.sls
+++ b/runtest/salttest/modules/openstack/init.sls
@@ -1,5 +1,6 @@
include:
- runtest.salttest.modules.openstack.glance
+- runtest.salttest.modules.openstack.glancev2
- runtest.salttest.modules.openstack.keystone
- runtest.salttest.modules.openstack.nova
- runtest.salttest.modules.openstack.neutron
diff --git a/runtest/salttest/states/openstack/barbican.sls b/runtest/salttest/states/openstack/barbican.sls
new file mode 100644
index 0000000..3728e24
--- /dev/null
+++ b/runtest/salttest/states/openstack/barbican.sls
@@ -0,0 +1,17 @@
+{%- set payload = salt['hashutil.base64_b64encode']('TEST_SECRET_CERT') %}
+barbican_secret_present:
+ barbicanv1.secret_present:
+ - cloud_name: admin_identity
+ - name: SaltTestSecret
+ - algorithm: RSA
+ - secret_type: certificate
+ - payload: {{ payload }}
+ - payload_content_type: application/octet-stream
+ - payload_content_encoding: base64
+
+barbican_secret_absent:
+ barbicanv1.secret_absent:
+ - cloud_name: admin_identity
+ - name: SaltTestSecret
+ - require:
+ - barbican_secret_present
diff --git a/runtest/salttest/states/openstack/glancev2.sls b/runtest/salttest/states/openstack/glancev2.sls
new file mode 100644
index 0000000..cfe8c99
--- /dev/null
+++ b/runtest/salttest/states/openstack/glancev2.sls
@@ -0,0 +1,15 @@
+{%- set glance_location = 'https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img' %}
+{%- set glance_properties = '{"container_format": "bare", "disk_format": "raw", "protected": false, "tags": ["tags1", "tags2"], "visibility": "public"}' %}
+glance_image_present:
+ glancev2.image_present:
+ - cloud_name: admin_identity
+ - name: TestImage
+ - location: {{ glance_location }}
+ - image_properties: {{ glance_properties }}
+
+glance_image_absent:
+ glancev2.image_absent:
+ - cloud_name: admin_identity
+ - name: TestImage
+ - require:
+ - glance_image_present
diff --git a/runtest/salttest/states/openstack/init.sls b/runtest/salttest/states/openstack/init.sls
index 2202afe..6a26911 100644
--- a/runtest/salttest/states/openstack/init.sls
+++ b/runtest/salttest/states/openstack/init.sls
@@ -1,3 +1,4 @@
include:
- runtest.salttest.states.openstack.neutron
- runtest.salttest.states.openstack.nova
+- runtest.salttest.states.openstack.glancev2