diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-07-28 16:00:36 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-28 16:00:36 -0400 |
commit | ee4524068c10df43eeb65bf2ab6606140743a4d5 (patch) | |
tree | d2f4de26617b459272899c2e8e25d2eaf94f33e1 /roles/lib_openshift/src/test | |
parent | fd48c2d15d13c53827bec2373f269b9728ac1f2d (diff) | |
parent | 3de24e3e4818aa6e1f836498fed81d913bbe827b (diff) | |
download | openshift-ee4524068c10df43eeb65bf2ab6606140743a4d5.tar.gz openshift-ee4524068c10df43eeb65bf2ab6606140743a4d5.tar.bz2 openshift-ee4524068c10df43eeb65bf2ab6606140743a4d5.tar.xz openshift-ee4524068c10df43eeb65bf2ab6606140743a4d5.zip |
Merge pull request #4879 from jcantrill/oc_pvc
Merged by openshift-bot
Diffstat (limited to 'roles/lib_openshift/src/test')
-rwxr-xr-x | roles/lib_openshift/src/test/integration/oc_pvc.yml | 28 | ||||
-rwxr-xr-x | roles/lib_openshift/src/test/unit/test_oc_pvc.py | 11 |
2 files changed, 39 insertions, 0 deletions
diff --git a/roles/lib_openshift/src/test/integration/oc_pvc.yml b/roles/lib_openshift/src/test/integration/oc_pvc.yml new file mode 100755 index 000000000..fb3a4781f --- /dev/null +++ b/roles/lib_openshift/src/test/integration/oc_pvc.yml @@ -0,0 +1,28 @@ +#!/usr/bin/ansible-playbook --module-path=../../../library/ +# ./oc_pvc.yml -e "cli_master_test=$OPENSHIFT_MASTER +--- +- hosts: "{{ cli_master_test }}" + gather_facts: no + user: root + tasks: + - name: create pvc + oc_pvc: + state: present + name: oc-pvc-create-test + namespace: default + volume_capacity: 3G + access_modes: + - ReadWriteOnce + selector: + foo: bar + storage_class_name: my-storage-class-name + register: pvcout + - debug: var=pvcout + + - assert: + that: + - pvcout.results.results[0]['metadata']['name'] == 'oc-pvc-create-test' + - pvcout.results.results[0]['spec']['storageClassName'] == 'my-storage-class-name' + - pvcout.results.results[0]['spec']['selector']['matchLabels']['foo'] == 'bar' + - pvcout.changed + msg: pvc create failed. diff --git a/roles/lib_openshift/src/test/unit/test_oc_pvc.py b/roles/lib_openshift/src/test/unit/test_oc_pvc.py index 82187917d..a96f2e4a7 100755 --- a/roles/lib_openshift/src/test/unit/test_oc_pvc.py +++ b/roles/lib_openshift/src/test/unit/test_oc_pvc.py @@ -30,6 +30,8 @@ class OCPVCTest(unittest.TestCase): 'name': 'mypvc', 'namespace': 'test', 'volume_capacity': '1G', + 'selector': {'foo': 'bar', 'abc': 'a123'}, + 'storage_class_name': 'mystorage', 'access_modes': 'ReadWriteMany'} @mock.patch('oc_pvc.Utils.create_tmpfile_copy') @@ -65,6 +67,13 @@ class OCPVCTest(unittest.TestCase): "storage": "1Gi" } }, + "selector": { + "matchLabels": { + "foo": "bar", + "abc": "a123" + } + }, + "storageClassName": "myStorage", "volumeName": "pv-aws-ow5vl" }, "status": { @@ -93,6 +102,8 @@ class OCPVCTest(unittest.TestCase): self.assertTrue(results['changed']) self.assertEqual(results['results']['results'][0]['metadata']['name'], 'mypvc') + self.assertEqual(results['results']['results'][0]['spec']['storageClassName'], 'myStorage') + self.assertEqual(results['results']['results'][0]['spec']['selector']['matchLabels']['foo'], 'bar') @mock.patch('oc_pvc.Utils.create_tmpfile_copy') @mock.patch('oc_pvc.OCPVC._run') |