Browse Source

Fix method name that was too long

Sean Dawson 7 years ago
parent
commit
8fd8612c17

+ 2 - 2
roles/lib_openshift/library/oc_storageclass.py

@@ -1570,7 +1570,7 @@ class OCStorageClass(OpenShiftCLI):
         return False
 
     @staticmethod
-    def provisioner_name_is_fully_qualified(provisioner_name):
+    def provisioner_name_qualified(provisioner_name):
         pattern = re.compile(r'^[a-z0-9A-Z-_.]+\/[a-z0-9A-Z-_.]+$')
         return pattern.match(provisioner_name)
 
@@ -1584,7 +1584,7 @@ class OCStorageClass(OpenShiftCLI):
         # E.g. if 'aws-efs' is provided as a provisioner, convert it to 'kubernetes.io/aws-efs'
         # but if the name is already qualified  (e.g. 'openshift.org/aws-efs') then leave it be.
         raw_provisioner_name = params['provisioner']
-        if OCStorageClass.provisioner_name_is_fully_qualified(raw_provisioner_name):
+        if OCStorageClass.provisioner_name_qualified(raw_provisioner_name):
             qualified_provisioner_name = raw_provisioner_name
         else:
             qualified_provisioner_name = "kubernetes.io/{}".format(params['provisioner'])

+ 2 - 2
roles/lib_openshift/src/class/oc_storageclass.py

@@ -65,7 +65,7 @@ class OCStorageClass(OpenShiftCLI):
         return False
 
     @staticmethod
-    def provisioner_name_is_fully_qualified(provisioner_name):
+    def provisioner_name_qualified(provisioner_name):
         pattern = re.compile(r'^[a-z0-9A-Z-_.]+\/[a-z0-9A-Z-_.]+$')
         return pattern.match(provisioner_name)
 
@@ -79,7 +79,7 @@ class OCStorageClass(OpenShiftCLI):
         # E.g. if 'aws-efs' is provided as a provisioner, convert it to 'kubernetes.io/aws-efs'
         # but if the name is already qualified  (e.g. 'openshift.org/aws-efs') then leave it be.
         raw_provisioner_name = params['provisioner']
-        if OCStorageClass.provisioner_name_is_fully_qualified(raw_provisioner_name):
+        if OCStorageClass.provisioner_name_qualified(raw_provisioner_name):
             qualified_provisioner_name = raw_provisioner_name
         else:
             qualified_provisioner_name = "kubernetes.io/{}".format(params['provisioner'])