openstack/horizon
Code Issues Proposed changes

Merge "Pre-select the network when there's only one."

Browse Source
This commit is contained in:
Jenkins 2014-03-24 17:46:41 +00:00 committed by Gerrit Code Review
commit 3554c020cd
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1106,7 +1106,8 @@ class InstanceTests(test.TestCase):
def test_launch_instance_get(self,
expect_password_fields=True,
block_device_mapping_v2=True,
custom_flavor_sort=None):
custom_flavor_sort=None,
only_one_network=False):
image = self.images.first()
api.nova.extension_supported('BlockDeviceMappingV2Boot',
@ -1128,8 +1129,12 @@ class InstanceTests(test.TestCase):
tenant_id=self.tenant.id,
shared=False) \
.AndReturn(self.networks.list()[:1])
api.neutron.network_list(IsA(http.HttpRequest),
shared=True) \
if only_one_network:
api.neutron.network_list(IsA(http.HttpRequest),
shared=True).AndReturn([])
else:
api.neutron.network_list(IsA(http.HttpRequest),
shared=True) \
.AndReturn(self.networks.list()[1:])
# TODO(absubram): Remove if clause and create separate
# test stubs for when profile_support is being used.
@ -1216,6 +1221,12 @@ class InstanceTests(test.TestCase):
else:
self.assertNotContains(res, boot_from_image_field_label)
checked_label = '<label for="id_network_0"><input checked="checked"'
if only_one_network:
self.assertContains(res, checked_label)
else:
self.assertNotContains(res, checked_label)
@test_utils.override_settings(
OPENSTACK_HYPERVISOR_FEATURES={'can_set_password': False})
def test_launch_instance_get_without_password(self):
@ -1256,6 +1267,9 @@ class InstanceTests(test.TestCase):
def test_launch_instance_get_custom_flavor_sort_by_missing_column(self):
self.test_launch_instance_get(custom_flavor_sort='no_such_column')
def test_launch_instance_get_with_only_one_network(self):
self.test_launch_instance_get(only_one_network=True)
@test.create_stubs({api.glance: ('image_list_detailed',),
api.neutron: ('network_list',
'profile_list',

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

@ -571,6 +571,12 @@ class SetNetworkAction(workflows.Action):
help_text=_("Launch instance with "
"this policy profile"))
def __init__(self, request, *args, **kwargs):
super(SetNetworkAction, self).__init__(request, *args, **kwargs)
network_list = self.fields["network"].choices
if len(network_list) == 1:
self.fields['network'].initial = [network_list[0][0]]
class Meta:
name = _("Networking")
permissions = ('openstack.services.network',)