openstack
/
manila-ui
Code Issues Proposed changes

Merge "Disable creation of public share types per configuration"

This commit is contained in:
Jenkins 2016-08-22 15:16:06 +00:00 committed by Gerrit Code Review
parent 7f0dc6aee4 e1912b176c
commit fd71458189
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manila_ui/dashboards/admin/shares/forms.py
View File

@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf import settings
from django.forms import ValidationError # noqa
from django.utils.translation import ugettext_lazy as _
from oslo_utils import strutils
@ -161,6 +162,15 @@ class CreateShareType(forms.SelfHandlingForm):
"or not. List of allowed tenants should be set "
"separately."))
def __init__(self, *args, **kwargs):
super(CreateShareType, self).__init__(*args, **kwargs)
manila_features = getattr(settings, 'OPENSTACK_MANILA_FEATURES', {})
self.enable_public_share_type_creation = manila_features.get(
'enable_public_share_type_creation', True)
if not self.enable_public_share_type_creation:
self.fields.pop('is_public')
def handle(self, request, data):
try:
spec_dhss = data['spec_driver_handles_share_servers'].lower()
@ -177,8 +187,10 @@ class CreateShareType(forms.SelfHandlingForm):
msg = _("Expected only pairs of key=value.")
raise ValidationError(message=msg)
is_public = (self.enable_public_share_type_creation
and data["is_public"])
share_type = manila.share_type_create(
request, data["name"], spec_dhss, is_public=data["is_public"])
request, data["name"], spec_dhss, is_public=is_public)
if set_dict:
manila.share_type_set_extra_specs(
request, share_type.id, set_dict)

36
manila_ui/tests/dashboards/admin/shares/test_forms.py
View File

@ -216,3 +216,39 @@ class ManilaDashboardsAdminSharesCreateShareTypeFormTests(base.APITestCase):
is_public=data["is_public"])
mock_horizon_messages_success.assert_called_once_with(
self.request, mock.ANY)
@ddt.data(True, False)
@mock.patch('horizon.messages.success')
def test_public_share_type_creation(self,
enable_public_share_type_creation,
mock_horizon_messages_success):
with self.settings(OPENSTACK_MANILA_FEATURES={
'enable_public_share_type_creation':
enable_public_share_type_creation}):
form = self._get_form()
data = {
'extra_specs': '',
'is_public': enable_public_share_type_creation,
'spec_driver_handles_share_servers': 'True',
'name': 'share',
}
result = form.handle(self.request, data)
self.assertTrue(result)
self.assertEqual(
enable_public_share_type_creation,
form.enable_public_share_type_creation)
if enable_public_share_type_creation:
self.assertIn("is_public", form.fields)
self.assertTrue(form.fields["is_public"])
else:
self.assertNotIn("is_public", form.fields)
self.manilaclient.share_types.create.assert_called_once_with(
name=data['name'],
spec_driver_handles_share_servers='true',
spec_snapshot_support=True,
is_public=enable_public_share_type_creation)
mock_horizon_messages_success.assert_called_once_with(
self.request, mock.ANY)