openstack/horizon
Code Issues Proposed changes

Merge "Use security group id not name in the create instance dialog"

Browse Source
This commit is contained in:
Jenkins 2015-09-03 20:22:57 +00:00 committed by Gerrit Code Review
commit 463990c25b
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
openstack_dashboard/dashboards/project/instances/tests.py
View File

@ -1731,7 +1731,7 @@ class InstanceTests(helpers.TestCase):
flavor.id,
keypair.name,
customization_script,
[sec_group.name],
[str(sec_group.id)],
block_device_mapping=None,
block_device_mapping_v2=None,
nics=nics,
@ -1756,7 +1756,7 @@ class InstanceTests(helpers.TestCase):
'script_data': customization_script,
'project_id': self.tenants.first().id,
'user_id': self.user.id,
'groups': sec_group.name,
'groups': str(sec_group.id),
'availability_zone': avail_zone.zoneName,
'volume_type': '',
'network': self.networks.first().id,
@ -1885,7 +1885,7 @@ class InstanceTests(helpers.TestCase):
'script_data': customization_script,
'project_id': self.tenants.first().id,
'user_id': self.user.id,
'groups': sec_group.name,
'groups': str(sec_group.id),
'availability_zone': avail_zone.zoneName,
'volume_type': '',
'network': self.networks.first().id,
@ -2050,7 +2050,7 @@ class InstanceTests(helpers.TestCase):
flavor.id,
keypair.name,
customization_script,
[sec_group.name],
[str(sec_group.id)],
block_device_mapping=block_device_mapping,
block_device_mapping_v2=block_device_mapping_2,
nics=nics,
@ -2073,7 +2073,7 @@ class InstanceTests(helpers.TestCase):
'script_data': customization_script,
'project_id': self.tenants.first().id,
'user_id': self.user.id,
'groups': sec_group.name,
'groups': str(sec_group.id),
'availability_zone': avail_zone.zoneName,
'volume_size': '1',
'volume_id': volume_choice,
@ -2195,7 +2195,7 @@ class InstanceTests(helpers.TestCase):
flavor.id,
keypair.name,
customization_script,
[sec_group.name],
[str(sec_group.id)],
block_device_mapping=block_device_mapping,
block_device_mapping_v2=None,
nics=nics,
@ -2216,7 +2216,7 @@ class InstanceTests(helpers.TestCase):
'script_data': customization_script,
'project_id': self.tenants.first().id,
'user_id': self.user.id,
'groups': sec_group.name,
'groups': str(sec_group.id),
'availability_zone': avail_zone.zoneName,
'network': self.networks.first().id,
'volume_type': 'volume_id',
@ -2323,7 +2323,7 @@ class InstanceTests(helpers.TestCase):
'script_data': customization_script,
'project_id': self.tenants.first().id,
'user_id': self.user.id,
'groups': sec_group.name,
'groups': str(sec_group.id),
'availability_zone': avail_zone.zoneName,
'volume_type': '',
'count': 1}
@ -2588,7 +2588,7 @@ class InstanceTests(helpers.TestCase):
flavor.id,
keypair.name,
customization_script,
[sec_group.name],
[str(sec_group.id)],
block_device_mapping=None,
block_device_mapping_v2=None,
nics=nics,
@ -2617,7 +2617,7 @@ class InstanceTests(helpers.TestCase):
'script_data': customization_script,
'project_id': self.tenants.first().id,
'user_id': self.user.id,
'groups': sec_group.name,
'groups': str(sec_group.id),
'volume_type': '',
'network': self.networks.first().id,
'count': 1,
@ -2729,7 +2729,7 @@ class InstanceTests(helpers.TestCase):
'script_data': customization_script,
'project_id': self.tenants.first().id,
'user_id': self.user.id,
'groups': sec_group.name,
'groups': str(sec_group.id),
'volume_type': 'volume_id',
'volume_id': volume_choice,
'device_name': device_name,
@ -2836,7 +2836,7 @@ class InstanceTests(helpers.TestCase):
'script_data': customization_script,
'project_id': self.tenants.first().id,
'user_id': self.user.id,
'groups': sec_group.name,
'groups': str(sec_group.id),
'volume_type': 'volume_id',
'volume_id': volume_choice,
'device_name': device_name,
@ -2960,7 +2960,7 @@ class InstanceTests(helpers.TestCase):
'script_data': customization_script,
'project_id': self.tenants.first().id,
'user_id': self.user.id,
'groups': sec_group.name,
'groups': str(sec_group.id),
'volume_type': 'volume_id',
'volume_id': volume_choice,
'device_name': device_name,
@ -3089,7 +3089,7 @@ class InstanceTests(helpers.TestCase):
'customization_script': customization_script,
'project_id': self.tenants.first().id,
'user_id': self.user.id,
'groups': sec_group.name,
'groups': str(sec_group.id),
'volume_type': 'volume_id',
'volume_id': volume_choice,
'volume_size': max(
@ -3219,7 +3219,7 @@ class InstanceTests(helpers.TestCase):
'script_data': customization_script,
'project_id': self.tenants.first().id,
'user_id': self.user.id,
'groups': sec_group.name,
'groups': str(sec_group.id),
'volume_size': volume_size,
'device_name': device_name,
'count': 1
@ -3402,7 +3402,7 @@ class InstanceTests(helpers.TestCase):
flavor.id,
keypair.name,
customization_script,
[sec_group.name],
[str(sec_group.id)],
block_device_mapping=None,
block_device_mapping_v2=device_mapping_v2,
nics=nics,
@ -3425,7 +3425,7 @@ class InstanceTests(helpers.TestCase):
'script_data': customization_script,
'project_id': self.tenants.first().id,
'user_id': self.user.id,
'groups': sec_group.name,
'groups': str(sec_group.id),
'volume_size': image.size,
'device_name': device_name,
'network': self.networks.first().id,
@ -4550,7 +4550,7 @@ class ConsoleManagerTests(helpers.TestCase):
flavor.id,
keypair.name,
customization_script,
[sec_group.name],
[str(sec_group.id)],
block_device_mapping=None,
block_device_mapping_v2=None,
nics=nics,
@ -4580,7 +4580,7 @@ class ConsoleManagerTests(helpers.TestCase):
'script_data': customization_script,
'project_id': self.tenants.first().id,
'user_id': self.user.id,
'groups': sec_group.name,
'groups': [str(sec_group.id)],
'volume_type': '',
'network': self.networks.first().id,
'count': 1,

6
openstack_dashboard/dashboards/project/instances/workflows/create_instance.py
View File

@ -580,7 +580,11 @@ class SetAccessControlsAction(workflows.Action):
def populate_groups_choices(self, request, context):
try:
groups = api.network.security_group_list(request)
security_group_list = [(sg.name, sg.name) for sg in groups]
if base.is_service_enabled(request, 'network'):
security_group_list = [(sg.id, sg.name) for sg in groups]
else:
# Nova-Network requires the groups to be listed by name
security_group_list = [(sg.name, sg.name) for sg in groups]
except Exception:
exceptions.handle(request,
_('Unable to retrieve list of security groups'))