diff options
| author | Valerii Ponomarov <vponomar@redhat.com> | 2018-10-05 21:02:32 +0530 |
|---|---|---|
| committer | Valerii Ponomarov <vponomar@redhat.com> | 2018-11-29 13:09:07 +0000 |
| commit | 1bde809ae7286d1dfbe1a69c07fd02e908689804 (patch) | |
| tree | f562d1e80fa688f7a7f956a29310fb04061605f3 /cns-libs/cnslibs/common/openshift_ops.py | |
| parent | ee94c5545589e7c2553d7aead517c2ba587aaa3b (diff) | |
[CNS-928] Create PVC using default Storage Class
We should be able to create PVC not specifying Storage Class,
but having 'default' one. So, add test to cover such feature.
Change-Id: Id1d6f14879bbc4af4955af4984ce91c2484fb55f
Diffstat (limited to 'cns-libs/cnslibs/common/openshift_ops.py')
| -rw-r--r-- | cns-libs/cnslibs/common/openshift_ops.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cns-libs/cnslibs/common/openshift_ops.py b/cns-libs/cnslibs/common/openshift_ops.py index 3eb78c8a..dae8cb27 100644 --- a/cns-libs/cnslibs/common/openshift_ops.py +++ b/cns-libs/cnslibs/common/openshift_ops.py @@ -326,7 +326,7 @@ def oc_create_sc(hostname, sc_name_prefix="autotests-sc", return sc_name -def oc_create_pvc(hostname, sc_name, pvc_name_prefix="autotests-pvc", +def oc_create_pvc(hostname, sc_name=None, pvc_name_prefix="autotests-pvc", pvc_size=1): """Create PVC using data provided as stdin input. @@ -338,15 +338,16 @@ def oc_create_pvc(hostname, sc_name, pvc_name_prefix="autotests-pvc", pvc_size (int/str): size of PVC in Gb """ pvc_name = "%s-%s" % (pvc_name_prefix, utils.get_random_str()) + metadata = {"name": pvc_name} + if sc_name: + metadata["annotations"] = { + "volume.kubernetes.io/storage-class": sc_name, + "volume.beta.kubernetes.io/storage-class": sc_name, + } pvc_data = json.dumps({ "kind": "PersistentVolumeClaim", "apiVersion": "v1", - "metadata": { - "name": pvc_name, - "annotations": { - "volume.beta.kubernetes.io/storage-class": sc_name, - }, - }, + "metadata": metadata, "spec": { "accessModes": ["ReadWriteOnce"], "resources": {"requests": {"storage": "%sGi" % pvc_size}} |