openstack/charm-manila-netapp
Code Issues Proposed changes

Change 'driver-handles-share-servers' config to default False

Browse Source
This commit is contained in:
Ionut Balutoiu 2021-03-10 10:11:50 +02:00
parent a85086d7af
commit 646eb408d4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.yaml
View File

@ -12,7 +12,7 @@ options:
description: | description: |
Whether the Manila driver should manage the Vservers within the Whether the Manila driver should manage the Vservers within the
NetApp ONTAP cluster. NetApp ONTAP cluster.
default: True default: False
root-volume-aggregate-name: root-volume-aggregate-name:
type: string type: string
description: | description: |

12
unit_tests/test_charm.py
View File

@ -20,7 +20,7 @@ class TestManilaNetappCharm(TestCase):
REQUIRED_CHARM_CONFIG_BY_DEFAULT = { REQUIRED_CHARM_CONFIG_BY_DEFAULT = {
'management-address': '10.0.0.1', 'management-address': '10.0.0.1',
'admin-password': 'my-secret-password', 'admin-password': 'my-secret-password',
'root-volume-aggregate-name': 'test_cluster_01_VM_DISK_1', 'vserver-name': 'svm0',
} }
def setUp(self): def setUp(self):
@ -55,10 +55,7 @@ class TestManilaNetappCharm(TestCase):
_send_backend_config, _install_pkgs): _send_backend_config, _install_pkgs):
_render.return_value = 'test-rendered-manila-backend-config' _render.return_value = 'test-rendered-manila-backend-config'
_get_loader.return_value = 'test-loader' _get_loader.return_value = 'test-loader'
charm_config = copy.deepcopy(self.REQUIRED_CHARM_CONFIG_BY_DEFAULT) self.harness.update_config(self.REQUIRED_CHARM_CONFIG_BY_DEFAULT)
charm_config['driver-handles-share-servers'] = False
charm_config['vserver-name'] = 'test-vserver'
self.harness.update_config(charm_config)
rel_id = self.harness.add_relation('manila-plugin', 'manila') rel_id = self.harness.add_relation('manila-plugin', 'manila')
self.harness.add_relation_unit(rel_id, 'manila/0') self.harness.add_relation_unit(rel_id, 'manila/0')
self.harness.begin_with_initial_hooks() self.harness.begin_with_initial_hooks()
@ -89,7 +86,10 @@ class TestManilaNetappCharm(TestCase):
_send_backend_config, _install_pkgs): _send_backend_config, _install_pkgs):
_render.return_value = 'test-rendered-manila-backend-config' _render.return_value = 'test-rendered-manila-backend-config'
_get_loader.return_value = 'test-loader' _get_loader.return_value = 'test-loader'
self.harness.update_config(self.REQUIRED_CHARM_CONFIG_BY_DEFAULT) config = copy.deepcopy(self.REQUIRED_CHARM_CONFIG_BY_DEFAULT)
config['driver-handles-share-servers'] = True
config['root-volume-aggregate-name'] = 'test_cluster_01_VM_DISK_1'
self.harness.update_config(config)
self.harness.begin_with_initial_hooks() self.harness.begin_with_initial_hooks()
# Validate workflow with incomplete relation data # Validate workflow with incomplete relation data