Skip to content

Commit

Permalink
Removed unused code. Made tests executable.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kenny Woodson committed Feb 21, 2017
1 parent 9979e07 commit b21a62a
Show file tree
Hide file tree
Showing 15 changed files with 12 additions and 50 deletions.
31 changes: 6 additions & 25 deletions roles/lib_openshift/library/oc_adm_registry.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2170,10 +2170,6 @@ def prepared_registry(self, data):
''' setter method for prepared_registry attribute '''
self.__prepared_registry = data

def force_prepare_registry(self):
'''force a registry prep'''
self.__prepared_registry = None

def get(self):
''' return the self.registry_parts '''
self.deploymentconfig = None
Expand Down Expand Up @@ -2284,9 +2280,6 @@ def create(self):
def update(self):
'''run update for the registry. This performs a delete and then create '''
# Store the current service IP
self.force_prepare_registry()

self.get()
if self.service:
svcip = self.service.get('spec.clusterIP')
if svcip:
Expand All @@ -2295,18 +2288,6 @@ def update(self):
if portip:
self.portal_ip = portip

#parts = self.delete(complete=False)
#for part in parts:
# if part['returncode'] != 0:
# if part.has_key('stderr') and 'not found' in part['stderr']:
# # the object is not there, continue
# continue
# # something went wrong
# return parts

# Ugly built in sleep here.
#time.sleep(10)

results = []
if self.prepared_registry['deployment_update']:
results.append(self._replace(self.prepared_registry['deployment_file']))
Expand Down Expand Up @@ -2361,7 +2342,7 @@ def add_modifications(self, deploymentconfig):

return deploymentconfig.yaml_dict

def needs_update(self, verbose=False):
def needs_update(self):
''' check to see if we need to update '''
if not self.service or not self.deploymentconfig:
return True
Expand All @@ -2370,15 +2351,14 @@ def needs_update(self, verbose=False):
if not Utils.check_def_equal(self.prepared_registry['service'].yaml_dict,
self.service.yaml_dict,
exclude_list,
verbose):
debug=self.verbose):
self.prepared_registry['service_update'] = True

exclude_list = ['dnsPolicy',
'terminationGracePeriodSeconds',
'restartPolicy', 'timeoutSeconds',
'livenessProbe', 'readinessProbe',
'terminationMessagePath',
'rollingParams',
'securityContext',
'imagePullPolicy',
'protocol', # ports.portocol: TCP
Expand All @@ -2390,7 +2370,7 @@ def needs_update(self, verbose=False):
if not Utils.check_def_equal(self.prepared_registry['deployment'].yaml_dict,
self.deploymentconfig.yaml_dict,
exclude_list,
verbose):
debug=self.verbose):
self.prepared_registry['deployment_update'] = True

return self.prepared_registry['deployment_update'] or self.prepared_registry['service_update'] or False
Expand Down Expand Up @@ -2422,14 +2402,15 @@ def run_ansible(params, check_mode):
})


ocregistry = Registry(rconfig)
ocregistry = Registry(rconfig, params['debug'])

api_rval = ocregistry.get()

state = params['state']
########
# get
########
if state == 'list':
api_rval = ocregistry.get()

if api_rval['returncode'] != 0:
return {'failed': True, 'msg': api_rval}
Expand Down
31 changes: 6 additions & 25 deletions roles/lib_openshift/src/class/oc_adm_registry.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,6 @@ def prepared_registry(self, data):
''' setter method for prepared_registry attribute '''
self.__prepared_registry = data

def force_prepare_registry(self):
'''force a registry prep'''
self.__prepared_registry = None

def get(self):
''' return the self.registry_parts '''
self.deploymentconfig = None
Expand Down Expand Up @@ -212,9 +208,6 @@ def create(self):
def update(self):
'''run update for the registry. This performs a delete and then create '''
# Store the current service IP
self.force_prepare_registry()

self.get()
if self.service:
svcip = self.service.get('spec.clusterIP')
if svcip:
Expand All @@ -223,18 +216,6 @@ def update(self):
if portip:
self.portal_ip = portip

#parts = self.delete(complete=False)
#for part in parts:
# if part['returncode'] != 0:
# if part.has_key('stderr') and 'not found' in part['stderr']:
# # the object is not there, continue
# continue
# # something went wrong
# return parts

# Ugly built in sleep here.
#time.sleep(10)

results = []
if self.prepared_registry['deployment_update']:
results.append(self._replace(self.prepared_registry['deployment_file']))
Expand Down Expand Up @@ -289,7 +270,7 @@ def add_modifications(self, deploymentconfig):

return deploymentconfig.yaml_dict

def needs_update(self, verbose=False):
def needs_update(self):
''' check to see if we need to update '''
if not self.service or not self.deploymentconfig:
return True
Expand All @@ -298,15 +279,14 @@ def needs_update(self, verbose=False):
if not Utils.check_def_equal(self.prepared_registry['service'].yaml_dict,
self.service.yaml_dict,
exclude_list,
verbose):
debug=self.verbose):
self.prepared_registry['service_update'] = True

exclude_list = ['dnsPolicy',
'terminationGracePeriodSeconds',
'restartPolicy', 'timeoutSeconds',
'livenessProbe', 'readinessProbe',
'terminationMessagePath',
'rollingParams',
'securityContext',
'imagePullPolicy',
'protocol', # ports.portocol: TCP
Expand All @@ -318,7 +298,7 @@ def needs_update(self, verbose=False):
if not Utils.check_def_equal(self.prepared_registry['deployment'].yaml_dict,
self.deploymentconfig.yaml_dict,
exclude_list,
verbose):
debug=self.verbose):
self.prepared_registry['deployment_update'] = True

return self.prepared_registry['deployment_update'] or self.prepared_registry['service_update'] or False
Expand Down Expand Up @@ -350,14 +330,15 @@ def run_ansible(params, check_mode):
})


ocregistry = Registry(rconfig)
ocregistry = Registry(rconfig, params['debug'])

api_rval = ocregistry.get()

state = params['state']
########
# get
########
if state == 'list':
api_rval = ocregistry.get()

if api_rval['returncode'] != 0:
return {'failed': True, 'msg': api_rval}
Expand Down
Empty file modified roles/lib_openshift/src/test/unit/test_oadm_manage_node.py
100644 → 100755
View file
Empty file.
Empty file modified roles/lib_openshift/src/test/unit/test_oc_env.py
100644 → 100755
View file
Empty file.
Empty file modified roles/lib_openshift/src/test/unit/test_oc_label.py
100644 → 100755
View file
Empty file.
Empty file modified roles/lib_openshift/src/test/unit/test_oc_process.py
100644 → 100755
View file
Empty file.
Empty file modified roles/lib_openshift/src/test/unit/test_oc_route.py
100644 → 100755
View file
Empty file.
Empty file modified roles/lib_openshift/src/test/unit/test_oc_scale.py
100644 → 100755
View file
Empty file.
Empty file modified roles/lib_openshift/src/test/unit/test_oc_secret.py
100644 → 100755
View file
Empty file.
Empty file modified roles/lib_openshift/src/test/unit/test_oc_service.py
100644 → 100755
View file
Empty file.
Empty file modified roles/lib_openshift/src/test/unit/test_oc_serviceaccount.py
100644 → 100755
View file
Empty file.
Empty file modified roles/lib_openshift/src/test/unit/test_oc_serviceaccount_secret.py
100644 → 100755
View file
Empty file.
Empty file modified roles/lib_openshift/src/test/unit/test_oc_version.py
100644 → 100755
View file
Empty file.
Empty file modified roles/lib_utils/src/test/unit/test_repoquery.py
100644 → 100755
View file
Empty file.
Empty file modified roles/lib_utils/src/test/unit/test_yedit.py
100644 → 100755
View file
Empty file.

0 comments on commit b21a62a

Please sign in to comment.