diff options
Diffstat (limited to 'roles/lib_openshift/src')
| -rw-r--r-- | roles/lib_openshift/src/ansible/oc_adm_manage_node.py (renamed from roles/lib_openshift/src/ansible/oadm_manage_node.py) | 0 | ||||
| -rw-r--r-- | roles/lib_openshift/src/class/oc_adm_manage_node.py (renamed from roles/lib_openshift/src/class/oadm_manage_node.py) | 0 | ||||
| -rw-r--r-- | roles/lib_openshift/src/doc/manage_node | 6 | ||||
| -rw-r--r-- | roles/lib_openshift/src/sources.yml | 6 | ||||
| -rwxr-xr-x | roles/lib_openshift/src/test/integration/oc_adm_manage_node.yml (renamed from roles/lib_openshift/src/test/integration/oadm_manage_node.yml) | 8 | ||||
| -rwxr-xr-x | roles/lib_openshift/src/test/unit/test_oc_adm_manage_node.py (renamed from roles/lib_openshift/src/test/unit/test_oadm_manage_node.py) | 14 | 
6 files changed, 17 insertions, 17 deletions
| diff --git a/roles/lib_openshift/src/ansible/oadm_manage_node.py b/roles/lib_openshift/src/ansible/oc_adm_manage_node.py index b870c1211..b870c1211 100644 --- a/roles/lib_openshift/src/ansible/oadm_manage_node.py +++ b/roles/lib_openshift/src/ansible/oc_adm_manage_node.py diff --git a/roles/lib_openshift/src/class/oadm_manage_node.py b/roles/lib_openshift/src/class/oc_adm_manage_node.py index c07320477..c07320477 100644 --- a/roles/lib_openshift/src/class/oadm_manage_node.py +++ b/roles/lib_openshift/src/class/oc_adm_manage_node.py diff --git a/roles/lib_openshift/src/doc/manage_node b/roles/lib_openshift/src/doc/manage_node index 382377f3e..b651ea4e7 100644 --- a/roles/lib_openshift/src/doc/manage_node +++ b/roles/lib_openshift/src/doc/manage_node @@ -3,7 +3,7 @@  DOCUMENTATION = '''  --- -module: oadm_manage_node +module: oc_adm_manage_node  short_description: Module to manage openshift nodes  description:    - Manage openshift nodes programmatically. @@ -75,13 +75,13 @@ extends_documentation_fragment: []  EXAMPLES = '''  - name: oadm manage-node --schedulable=true --selector=ops_node=new -  oadm_manage_node: +  oc_adm_manage_node:      selector: ops_node=new      schedulable: True    register: schedout  - name: oadm manage-node my-k8s-node-5 --evacuate -  oadm_manage_node: +  oc_adm_manage_node:      node:  my-k8s-node-5      evacuate: True      force: True diff --git a/roles/lib_openshift/src/sources.yml b/roles/lib_openshift/src/sources.yml index f16b3c8de..44a1524b0 100644 --- a/roles/lib_openshift/src/sources.yml +++ b/roles/lib_openshift/src/sources.yml @@ -9,15 +9,15 @@ oc_adm_ca_server_cert.py:  - class/oc_adm_ca_server_cert.py  - ansible/oc_adm_ca_server_cert.py -oadm_manage_node.py: +oc_adm_manage_node.py:  - doc/generated  - doc/license  - lib/import.py  - doc/manage_node  - ../../lib_utils/src/class/yedit.py  - lib/base.py -- class/oadm_manage_node.py -- ansible/oadm_manage_node.py +- class/oc_adm_manage_node.py +- ansible/oc_adm_manage_node.py  oc_adm_policy_user.py:  - doc/generated diff --git a/roles/lib_openshift/src/test/integration/oadm_manage_node.yml b/roles/lib_openshift/src/test/integration/oc_adm_manage_node.yml index 3ee13a409..1ed2ef11b 100755 --- a/roles/lib_openshift/src/test/integration/oadm_manage_node.yml +++ b/roles/lib_openshift/src/test/integration/oc_adm_manage_node.yml @@ -1,6 +1,6 @@  #!/usr/bin/ansible-playbook --module-path=../../../library/  # -# ./oadm_manage_node.yml -e "cli_master_test=$OPENSHIFT_MASTER +# ./oc_adm_manage_node.yml -e "cli_master_test=$OPENSHIFT_MASTER  ---  - hosts: "{{ cli_master_test }}"    gather_facts: no @@ -17,7 +17,7 @@        node_to_test: "{{ obj_out['results']['results'][0]['items'][0]['metadata']['name'] }}"    - name: list pods from a node -    oadm_manage_node: +    oc_adm_manage_node:        list_pods: True        node:        - "{{ node_to_test }}" @@ -29,7 +29,7 @@        msg: Pod data was not returned    - name: set node to unschedulable -    oadm_manage_node: +    oc_adm_manage_node:        schedulable: False        node:        - "{{ node_to_test }}" @@ -56,7 +56,7 @@        that: nodeout.results.results[0]['spec']['unschedulable']    - name: set node to schedulable -    oadm_manage_node: +    oc_adm_manage_node:        schedulable: True        node:        - "{{ node_to_test }}" diff --git a/roles/lib_openshift/src/test/unit/test_oadm_manage_node.py b/roles/lib_openshift/src/test/unit/test_oc_adm_manage_node.py index 27d98b869..312b1ecbb 100755 --- a/roles/lib_openshift/src/test/unit/test_oadm_manage_node.py +++ b/roles/lib_openshift/src/test/unit/test_oc_adm_manage_node.py @@ -1,5 +1,5 @@  ''' - Unit tests for oadm_manage_node + Unit tests for oc_adm_manage_node  '''  import os @@ -16,16 +16,16 @@ import mock  # place class in our python path  module_path = os.path.join('/'.join(os.path.realpath(__file__).split('/')[:-4]), 'library')  # noqa: E501  sys.path.insert(0, module_path) -from oadm_manage_node import ManageNode, locate_oc_binary  # noqa: E402 +from oc_adm_manage_node import ManageNode, locate_oc_binary  # noqa: E402  class ManageNodeTest(unittest.TestCase):      ''' -     Test class for oadm_manage_node +     Test class for oc_adm_manage_node      ''' -    @mock.patch('oadm_manage_node.Utils.create_tmpfile_copy') -    @mock.patch('oadm_manage_node.ManageNode.openshift_cmd') +    @mock.patch('oc_adm_manage_node.Utils.create_tmpfile_copy') +    @mock.patch('oc_adm_manage_node.ManageNode.openshift_cmd')      def test_list_pods(self, mock_openshift_cmd, mock_tmpfile_copy):          ''' Testing a get '''          params = {'node': ['ip-172-31-49-140.ec2.internal'], @@ -107,8 +107,8 @@ class ManageNodeTest(unittest.TestCase):          # returned 2 pods          self.assertTrue(len(results['results']['nodes']['ip-172-31-49-140.ec2.internal']) == 2) -    @mock.patch('oadm_manage_node.Utils.create_tmpfile_copy') -    @mock.patch('oadm_manage_node.ManageNode.openshift_cmd') +    @mock.patch('oc_adm_manage_node.Utils.create_tmpfile_copy') +    @mock.patch('oc_adm_manage_node.ManageNode.openshift_cmd')      def test_schedulable_false(self, mock_openshift_cmd, mock_tmpfile_copy):          ''' Testing a get '''          params = {'node': ['ip-172-31-49-140.ec2.internal'], | 
