rename kubernetes module to kubernetesmod

This makes sure this doesn't import the kubernetes module from
salt/modules while the kubernetes python module is not installed
This commit is contained in:
Daniel Wallace 2019-03-01 13:32:47 -06:00
parent a027c97140
commit 8572c17091
No known key found for this signature in database
GPG key ID: 23676C5831BE870E
6 changed files with 14 additions and 14 deletions

View file

@ -1,6 +0,0 @@
=======================
salt.modules.kubernetes
=======================
.. automodule:: salt.modules.kubernetes
:members:

View file

@ -0,0 +1,6 @@
==========================
salt.modules.kubernetesmod
==========================
.. automodule:: salt.modules.kubernetesmod
:members:

View file

@ -710,7 +710,7 @@ Execution modules
- :mod:`salt.modules.grafana4 <salt.modules.grafana4>`
- :mod:`salt.modules.heat <salt.modules.heat>`
- :mod:`salt.modules.icinga2 <salt.modules.icinga2>`
- :mod:`salt.modules.kubernetes <salt.modules.kubernetes>`
- :mod:`salt.modules.kubernetesmod <salt.modules.kubernetesmod>`
- :mod:`salt.modules.logmod <salt.modules.logmod>`
- :mod:`salt.modules.mattermost <salt.modules.mattermost>`
- :mod:`salt.modules.namecheap_dns <salt.modules.namecheap_dns>`

View file

@ -4,7 +4,7 @@ Manage kubernetes resources as salt states
==========================================
NOTE: This module requires the proper pillar values set. See
salt.modules.kubernetes for more information.
salt.modules.kubernetesmod for more information.
.. warning::

View file

@ -18,7 +18,7 @@ from tests.support.mock import (
NO_MOCK_REASON
)
from salt.modules import kubernetes
from salt.modules import kubernetesmod
@contextmanager
@ -28,7 +28,7 @@ def mock_kubernetes_library():
it caused kubernetes._cleanup() to get called for virtually every
test, which blows up. This prevents that specific blow-up once
"""
with patch('salt.modules.kubernetes.kubernetes') as mock_kubernetes_lib:
with patch('salt.modules.kubernetesmod.kubernetes') as mock_kubernetes_lib:
mock_kubernetes_lib.client.configuration.ssl_ca_cert = ''
mock_kubernetes_lib.client.configuration.cert_file = ''
mock_kubernetes_lib.client.configuration.key_file = ''
@ -40,7 +40,7 @@ def mock_kubernetes_library():
"Skipping test_kubernetes.py")
class KubernetesTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.kubernetes
Test cases for salt.modules.kubernetesmod
'''
def setup_loader_modules(self):
@ -114,7 +114,7 @@ class KubernetesTestCase(TestCase, LoaderModuleMockMixin):
:return:
'''
with mock_kubernetes_library() as mock_kubernetes_lib:
with patch('salt.modules.kubernetes.show_deployment', Mock(return_value=None)):
with patch('salt.modules.kubernetesmod.show_deployment', Mock(return_value=None)):
with patch.dict(kubernetes.__salt__, {'config.option': Mock(return_value="")}):
mock_kubernetes_lib.client.V1DeleteOptions = Mock(return_value="")
mock_kubernetes_lib.client.ExtensionsV1beta1Api.return_value = Mock(
@ -164,7 +164,7 @@ class KubernetesTestCase(TestCase, LoaderModuleMockMixin):
Test kubernetes.node_labels
:return:
'''
with patch('salt.modules.kubernetes.node') as mock_node:
with patch('salt.modules.kubernetesmod.node') as mock_node:
mock_node.return_value = {
'metadata': {
'labels': {
@ -184,7 +184,7 @@ class KubernetesTestCase(TestCase, LoaderModuleMockMixin):
kubectl [apply|create|replace] --record does
:return:
'''
with patch('salt.modules.kubernetes.sys.argv', ['/usr/bin/salt-call', 'state.apply']) as mock_sys:
with patch('salt.modules.kubernetesmod.sys.argv', ['/usr/bin/salt-call', 'state.apply']) as mock_sys:
func = getattr(kubernetes, '__dict_to_object_meta')
data = func(name='test-pod', namespace='test', metadata={})