Skip to content

Commit

Permalink
Removing ordereddict. Replaced with sorted keys.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kenny Woodson committed Mar 8, 2017
1 parent 842b69b commit 49f46a7
Show file tree
Hide file tree
Showing 26 changed files with 97 additions and 95 deletions.
8 changes: 4 additions & 4 deletions roles/lib_openshift/library/oadm_manage_node.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

from __future__ import print_function
import atexit
import collections
import copy
import json
import os
Expand Down Expand Up @@ -1345,7 +1344,7 @@ def __init__(self, rname, namespace, kubeconfig, options):
self.kubeconfig = kubeconfig
self.name = rname
self.namespace = namespace
self._options = collections.OrderedDict(options)
self._options = options

@property
def config_options(self):
Expand All @@ -1359,10 +1358,11 @@ def to_option_list(self):
def stringify(self):
''' return the options hash as cli params in a string '''
rval = []
for key, data in self.config_options.items():
for key in sorted(self.config_options.keys()):
data = self.config_options[key]
if data['include'] \
and (data['value'] or isinstance(data['value'], int)):
rval.append('--%s=%s' % (key.replace('_', '-'), data['value']))
rval.append('--{}={}'.format(key.replace('_', '-'), data['value']))

return rval

Expand Down
8 changes: 4 additions & 4 deletions roles/lib_openshift/library/oc_adm_ca_server_cert.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

from __future__ import print_function
import atexit
import collections
import copy
import json
import os
Expand Down Expand Up @@ -1353,7 +1352,7 @@ def __init__(self, rname, namespace, kubeconfig, options):
self.kubeconfig = kubeconfig
self.name = rname
self.namespace = namespace
self._options = collections.OrderedDict(options)
self._options = options

@property
def config_options(self):
Expand All @@ -1367,10 +1366,11 @@ def to_option_list(self):
def stringify(self):
''' return the options hash as cli params in a string '''
rval = []
for key, data in self.config_options.items():
for key in sorted(self.config_options.keys()):
data = self.config_options[key]
if data['include'] \
and (data['value'] or isinstance(data['value'], int)):
rval.append('--%s=%s' % (key.replace('_', '-'), data['value']))
rval.append('--{}={}'.format(key.replace('_', '-'), data['value']))

return rval

Expand Down
8 changes: 4 additions & 4 deletions roles/lib_openshift/library/oc_adm_policy_group.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

from __future__ import print_function
import atexit
import collections
import copy
import json
import os
Expand Down Expand Up @@ -1331,7 +1330,7 @@ def __init__(self, rname, namespace, kubeconfig, options):
self.kubeconfig = kubeconfig
self.name = rname
self.namespace = namespace
self._options = collections.OrderedDict(options)
self._options = options

@property
def config_options(self):
Expand All @@ -1345,10 +1344,11 @@ def to_option_list(self):
def stringify(self):
''' return the options hash as cli params in a string '''
rval = []
for key, data in self.config_options.items():
for key in sorted(self.config_options.keys()):
data = self.config_options[key]
if data['include'] \
and (data['value'] or isinstance(data['value'], int)):
rval.append('--%s=%s' % (key.replace('_', '-'), data['value']))
rval.append('--{}={}'.format(key.replace('_', '-'), data['value']))

return rval

Expand Down
8 changes: 4 additions & 4 deletions roles/lib_openshift/library/oc_adm_policy_user.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

from __future__ import print_function
import atexit
import collections
import copy
import json
import os
Expand Down Expand Up @@ -1331,7 +1330,7 @@ def __init__(self, rname, namespace, kubeconfig, options):
self.kubeconfig = kubeconfig
self.name = rname
self.namespace = namespace
self._options = collections.OrderedDict(options)
self._options = options

@property
def config_options(self):
Expand All @@ -1345,10 +1344,11 @@ def to_option_list(self):
def stringify(self):
''' return the options hash as cli params in a string '''
rval = []
for key, data in self.config_options.items():
for key in sorted(self.config_options.keys()):
data = self.config_options[key]
if data['include'] \
and (data['value'] or isinstance(data['value'], int)):
rval.append('--%s=%s' % (key.replace('_', '-'), data['value']))
rval.append('--{}={}'.format(key.replace('_', '-'), data['value']))

return rval

Expand Down
10 changes: 5 additions & 5 deletions roles/lib_openshift/library/oc_adm_registry.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

from __future__ import print_function
import atexit
import collections
import copy
import json
import os
Expand Down Expand Up @@ -1449,7 +1448,7 @@ def __init__(self, rname, namespace, kubeconfig, options):
self.kubeconfig = kubeconfig
self.name = rname
self.namespace = namespace
self._options = collections.OrderedDict(options)
self._options = options

@property
def config_options(self):
Expand All @@ -1463,10 +1462,11 @@ def to_option_list(self):
def stringify(self):
''' return the options hash as cli params in a string '''
rval = []
for key, data in self.config_options.items():
for key in sorted(self.config_options.keys()):
data = self.config_options[key]
if data['include'] \
and (data['value'] or isinstance(data['value'], int)):
rval.append('--%s=%s' % (key.replace('_', '-'), data['value']))
rval.append('--{}={}'.format(key.replace('_', '-'), data['value']))

return rval

Expand Down Expand Up @@ -2293,7 +2293,7 @@ def prepare_registry(self):
''' prepare a registry for instantiation '''
options = self.config.to_option_list()

cmd = ['registry', '-n', self.config.namespace]
cmd = ['registry']
cmd.extend(options)
cmd.extend(['--dry-run=True', '-o', 'json'])

Expand Down
10 changes: 5 additions & 5 deletions roles/lib_openshift/library/oc_adm_router.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

from __future__ import print_function
import atexit
import collections
import copy
import json
import os
Expand Down Expand Up @@ -1474,7 +1473,7 @@ def __init__(self, rname, namespace, kubeconfig, options):
self.kubeconfig = kubeconfig
self.name = rname
self.namespace = namespace
self._options = collections.OrderedDict(options)
self._options = options

@property
def config_options(self):
Expand All @@ -1488,10 +1487,11 @@ def to_option_list(self):
def stringify(self):
''' return the options hash as cli params in a string '''
rval = []
for key, data in self.config_options.items():
for key in sorted(self.config_options.keys()):
data = self.config_options[key]
if data['include'] \
and (data['value'] or isinstance(data['value'], int)):
rval.append('--%s=%s' % (key.replace('_', '-'), data['value']))
rval.append('--{}={}'.format(key.replace('_', '-'), data['value']))

return rval

Expand Down Expand Up @@ -2730,7 +2730,7 @@ def _prepare_router(self):

options = self.config.to_option_list()

cmd = ['router', self.config.name, '-n', self.config.namespace]
cmd = ['router', self.config.name]
cmd.extend(options)
cmd.extend(['--dry-run=True', '-o', 'json'])

Expand Down
8 changes: 4 additions & 4 deletions roles/lib_openshift/library/oc_edit.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

from __future__ import print_function
import atexit
import collections
import copy
import json
import os
Expand Down Expand Up @@ -1373,7 +1372,7 @@ def __init__(self, rname, namespace, kubeconfig, options):
self.kubeconfig = kubeconfig
self.name = rname
self.namespace = namespace
self._options = collections.OrderedDict(options)
self._options = options

@property
def config_options(self):
Expand All @@ -1387,10 +1386,11 @@ def to_option_list(self):
def stringify(self):
''' return the options hash as cli params in a string '''
rval = []
for key, data in self.config_options.items():
for key in sorted(self.config_options.keys()):
data = self.config_options[key]
if data['include'] \
and (data['value'] or isinstance(data['value'], int)):
rval.append('--%s=%s' % (key.replace('_', '-'), data['value']))
rval.append('--{}={}'.format(key.replace('_', '-'), data['value']))

return rval

Expand Down
8 changes: 4 additions & 4 deletions roles/lib_openshift/library/oc_env.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

from __future__ import print_function
import atexit
import collections
import copy
import json
import os
Expand Down Expand Up @@ -1340,7 +1339,7 @@ def __init__(self, rname, namespace, kubeconfig, options):
self.kubeconfig = kubeconfig
self.name = rname
self.namespace = namespace
self._options = collections.OrderedDict(options)
self._options = options

@property
def config_options(self):
Expand All @@ -1354,10 +1353,11 @@ def to_option_list(self):
def stringify(self):
''' return the options hash as cli params in a string '''
rval = []
for key, data in self.config_options.items():
for key in sorted(self.config_options.keys()):
data = self.config_options[key]
if data['include'] \
and (data['value'] or isinstance(data['value'], int)):
rval.append('--%s=%s' % (key.replace('_', '-'), data['value']))
rval.append('--{}={}'.format(key.replace('_', '-'), data['value']))

return rval

Expand Down
8 changes: 4 additions & 4 deletions roles/lib_openshift/library/oc_label.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

from __future__ import print_function
import atexit
import collections
import copy
import json
import os
Expand Down Expand Up @@ -1349,7 +1348,7 @@ def __init__(self, rname, namespace, kubeconfig, options):
self.kubeconfig = kubeconfig
self.name = rname
self.namespace = namespace
self._options = collections.OrderedDict(options)
self._options = options

@property
def config_options(self):
Expand All @@ -1363,10 +1362,11 @@ def to_option_list(self):
def stringify(self):
''' return the options hash as cli params in a string '''
rval = []
for key, data in self.config_options.items():
for key in sorted(self.config_options.keys()):
data = self.config_options[key]
if data['include'] \
and (data['value'] or isinstance(data['value'], int)):
rval.append('--%s=%s' % (key.replace('_', '-'), data['value']))
rval.append('--{}={}'.format(key.replace('_', '-'), data['value']))

return rval

Expand Down
8 changes: 4 additions & 4 deletions roles/lib_openshift/library/oc_obj.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

from __future__ import print_function
import atexit
import collections
import copy
import json
import os
Expand Down Expand Up @@ -1352,7 +1351,7 @@ def __init__(self, rname, namespace, kubeconfig, options):
self.kubeconfig = kubeconfig
self.name = rname
self.namespace = namespace
self._options = collections.OrderedDict(options)
self._options = options

@property
def config_options(self):
Expand All @@ -1366,10 +1365,11 @@ def to_option_list(self):
def stringify(self):
''' return the options hash as cli params in a string '''
rval = []
for key, data in self.config_options.items():
for key in sorted(self.config_options.keys()):
data = self.config_options[key]
if data['include'] \
and (data['value'] or isinstance(data['value'], int)):
rval.append('--%s=%s' % (key.replace('_', '-'), data['value']))
rval.append('--{}={}'.format(key.replace('_', '-'), data['value']))

return rval

Expand Down
8 changes: 4 additions & 4 deletions roles/lib_openshift/library/oc_objectvalidator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

from __future__ import print_function
import atexit
import collections
import copy
import json
import os
Expand Down Expand Up @@ -1284,7 +1283,7 @@ def __init__(self, rname, namespace, kubeconfig, options):
self.kubeconfig = kubeconfig
self.name = rname
self.namespace = namespace
self._options = collections.OrderedDict(options)
self._options = options

@property
def config_options(self):
Expand All @@ -1298,10 +1297,11 @@ def to_option_list(self):
def stringify(self):
''' return the options hash as cli params in a string '''
rval = []
for key, data in self.config_options.items():
for key in sorted(self.config_options.keys()):
data = self.config_options[key]
if data['include'] \
and (data['value'] or isinstance(data['value'], int)):
rval.append('--%s=%s' % (key.replace('_', '-'), data['value']))
rval.append('--{}={}'.format(key.replace('_', '-'), data['value']))

return rval

Expand Down
8 changes: 4 additions & 4 deletions roles/lib_openshift/library/oc_process.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

from __future__ import print_function
import atexit
import collections
import copy
import json
import os
Expand Down Expand Up @@ -1341,7 +1340,7 @@ def __init__(self, rname, namespace, kubeconfig, options):
self.kubeconfig = kubeconfig
self.name = rname
self.namespace = namespace
self._options = collections.OrderedDict(options)
self._options = options

@property
def config_options(self):
Expand All @@ -1355,10 +1354,11 @@ def to_option_list(self):
def stringify(self):
''' return the options hash as cli params in a string '''
rval = []
for key, data in self.config_options.items():
for key in sorted(self.config_options.keys()):
data = self.config_options[key]
if data['include'] \
and (data['value'] or isinstance(data['value'], int)):
rval.append('--%s=%s' % (key.replace('_', '-'), data['value']))
rval.append('--{}={}'.format(key.replace('_', '-'), data['value']))

return rval

Expand Down
Loading

0 comments on commit 49f46a7

Please sign in to comment.