check_def_equal: user_def should always be a dict

roles/lib_openshift/library/oc_adm_ca_server_cert.py

@@ -1358,6 +1358,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1487,7 +1490,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: class/oc_adm_ca_server_cert.py -*- -*- -*-

roles/lib_openshift/library/oc_adm_csr.py

@@ -1338,6 +1338,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1467,7 +1470,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: class/oc_adm_csr.py -*- -*- -*-

roles/lib_openshift/library/oc_adm_manage_node.py

@@ -1344,6 +1344,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1473,7 +1476,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: class/oc_adm_manage_node.py -*- -*- -*-

roles/lib_openshift/library/oc_adm_policy_group.py

@@ -1336,6 +1336,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1465,7 +1468,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/rolebinding.py -*- -*- -*-

roles/lib_openshift/library/oc_adm_policy_user.py

@@ -1350,6 +1350,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1479,7 +1482,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/rolebinding.py -*- -*- -*-

roles/lib_openshift/library/oc_adm_registry.py

@@ -1449,6 +1449,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1578,7 +1581,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/deploymentconfig.py -*- -*- -*-

roles/lib_openshift/library/oc_adm_router.py

@@ -1462,6 +1462,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1591,7 +1594,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/service.py -*- -*- -*-

roles/lib_openshift/library/oc_clusterrole.py

@@ -1322,6 +1322,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1451,7 +1454,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/rule.py -*- -*- -*-

roles/lib_openshift/library/oc_configmap.py

@@ -1328,6 +1328,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1457,7 +1460,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: class/oc_configmap.py -*- -*- -*-

roles/lib_openshift/library/oc_edit.py

@@ -1378,6 +1378,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1507,7 +1510,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: class/oc_edit.py -*- -*- -*-

roles/lib_openshift/library/oc_env.py

@@ -1339,6 +1339,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1468,7 +1471,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/deploymentconfig.py -*- -*- -*-

roles/lib_openshift/library/oc_group.py

@@ -1312,6 +1312,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1441,7 +1444,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/group.py -*- -*- -*-

roles/lib_openshift/library/oc_image.py

@@ -1331,6 +1331,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1460,7 +1463,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: class/oc_image.py -*- -*- -*-

roles/lib_openshift/library/oc_label.py

@@ -1348,6 +1348,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1477,7 +1480,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: class/oc_label.py -*- -*- -*-

roles/lib_openshift/library/oc_obj.py

@@ -1358,6 +1358,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1487,7 +1490,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: class/oc_obj.py -*- -*- -*-

roles/lib_openshift/library/oc_objectvalidator.py

@@ -1283,6 +1283,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1412,7 +1415,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: class/oc_objectvalidator.py -*- -*- -*-

roles/lib_openshift/library/oc_process.py

@@ -1340,6 +1340,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1469,7 +1472,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: class/oc_process.py -*- -*- -*-

roles/lib_openshift/library/oc_project.py

@@ -1340,6 +1340,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1469,7 +1472,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/project.py -*- -*- -*-

roles/lib_openshift/library/oc_pvc.py

@@ -1344,6 +1344,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1473,7 +1476,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/pvc.py -*- -*- -*-

roles/lib_openshift/library/oc_route.py

@@ -1391,6 +1391,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1520,7 +1523,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/route.py -*- -*- -*-

roles/lib_openshift/library/oc_scale.py

@@ -1326,6 +1326,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1455,7 +1458,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/deploymentconfig.py -*- -*- -*-

roles/lib_openshift/library/oc_secret.py

@@ -1387,6 +1387,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1516,7 +1519,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/secret.py -*- -*- -*-

roles/lib_openshift/library/oc_service.py

@@ -1394,6 +1394,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1523,7 +1526,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/service.py -*- -*- -*-

roles/lib_openshift/library/oc_serviceaccount.py

@@ -1327,6 +1327,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1456,7 +1459,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/serviceaccount.py -*- -*- -*-

roles/lib_openshift/library/oc_serviceaccount_secret.py

@@ -1327,6 +1327,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1456,7 +1459,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/serviceaccount.py -*- -*- -*-

roles/lib_openshift/library/oc_storageclass.py

@@ -1357,6 +1357,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1486,7 +1489,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/storageclass.py -*- -*- -*-

roles/lib_openshift/library/oc_user.py

@@ -1384,6 +1384,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1513,7 +1516,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/user.py -*- -*- -*-

roles/lib_openshift/library/oc_version.py

@@ -1297,6 +1297,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1426,7 +1429,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: class/oc_version.py -*- -*- -*-

roles/lib_openshift/library/oc_volume.py

@@ -1373,6 +1373,9 @@ class Utils(object):  # pragma: no cover
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -1502,7 +1505,6 @@ class OpenShiftCLIConfig(object):
 
         return rval
 
-
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
 # -*- -*- -*- Begin included fragment: lib/deploymentconfig.py -*- -*- -*-

roles/lib_openshift/src/lib/base.py

@@ -495,6 +495,9 @@ class Utils(object):
     def check_def_equal(user_def, result_def, skip_keys=None, debug=False):
         ''' Given a user defined definition, compare it with the results given back by our query.  '''
 
+        if user_def is None:
+            user_def = {}
+
         # Currently these values are autogenerated and we do not need to check them
         skip = ['metadata', 'status']
         if skip_keys:
@@ -623,4 +626,3 @@ class OpenShiftCLIConfig(object):
                 rval.append('--{}={}'.format(key.replace('_', '-'), val))
 
         return rval
-