x
/
group-based-policy-ui
Code Issues Proposed changes

Support create member with multiple NICs 

Added Networking Tab to member create work flow.
Deault provider PTG will be shown as selected
NIC, additionally user can select other PTGs
to to add multiple NICs

Change-Id: I3ceadc0f2ca9de6d9be2c4349eba6623a9aa4cd4
Closes-Bug: #1491540
This commit is contained in:
ank 2015-12-03 08:51:57 +05:30
parent aefb07dd91
commit 276a0fd1ab
2 changed files with 112 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gbpui/panels/policytargets/templates/policytargets/_update_groups.html Normal file
View File

@ -0,0 +1,48 @@
{% load i18n %}
<noscript><h3>{{ step }}</h3></noscript>
<table class="table-fixed" id="networkListSortContainer">
<tbody>
<tr>
<td class="actions">
<label id="selected_network_label">{% trans "Selected groups" %}</label>
<ul id="selected_network" class="networklist">
</ul>
<label>{% trans "Available groups" %}</label>
<ul id="available_network" class="networklist">
</ul>
</td>
<td class="help_text">
<p>{% blocktrans %}Choose group from Available groups to Selected
groups by push button or drag and drop, you may change group order
by drag and drop as well. {% endblocktrans %}</p>
</td>
</tr>
</tbody>
</table>
<table class="table-fixed" id="networkListIdContainer">
<tbody>
<tr>
<td class="actions">
<div id="networkListId">
{% include "horizon/common/_form_fields.html" %}
</div>
</td>
<td class="help_text">
{{ step.get_help_text }}
</td>
</tr>
</tbody>
</table>
<script>
if (typeof $ !== 'undefined') {
horizon.instances.workflow_init($(".workflow"));
} else {
addHorizonLoadEvent(function() {
horizon.instances.workflow_init($(".workflow"));
});
}
</script>

70
gbpui/panels/policytargets/workflows.py
View File

@ -13,6 +13,7 @@
import logging
from django.core.urlresolvers import reverse
from django import shortcuts
from django.utils import html
from django.utils.text import normalize_newlines # noqa
from django.utils.translation import ugettext_lazy as _
@ -389,6 +390,60 @@ class SetAccessControls(workflows.Step):
return context
class SetGroupAction(workflows.Action):
# To reuse horizon instance launch code related to Networking,
# form filed must be 'network' only
network = forms.MultipleChoiceField(label=_("Groups"),
widget=forms.CheckboxSelectMultiple(),
error_messages={
'required': _(
"At least one group must"
" be specified.")},
help_text=_("Launch member instance in"
" these groups"))
widget = forms.HiddenInput()
def __init__(self, request, *args, **kwargs):
super(SetGroupAction, self).__init__(request, *args, **kwargs)
policy_targetid = self.request.path.split("/")[-2]
self.fields['network'].initial = [policy_targetid]
class Meta(object):
name = _("Groups")
help_text = _("Select groups for launching the member instance in.")
def populate_network_choices(self, request, context):
try:
pt_list = []
pts = client.policy_target_list(request,
tenant_id=request.user.tenant_id)
for pt in pts:
pt.set_id_as_name_if_empty()
pt_list.append((pt.id, pt.name))
return sorted(pt_list, key=lambda obj: obj[1])
except Exception:
msg = _("Failed to retrieve groups")
LOG.error(msg)
exceptions.handle(request, msg, redirect=shortcuts.redirect)
class SetGroup(workflows.Step):
action_class = SetGroupAction
template_name = "project/policytargets/_update_groups.html"
contributes = ("group_id",)
def contribute(self, data, context):
if data:
groups = self.workflow.request.POST.getlist("network")
groups = [n for n in groups if n != '']
if groups:
context['group_id'] = groups
return context
class LaunchInstance(workflows.Workflow):
slug = "create_member"
name = _("Create Member")
@ -398,6 +453,7 @@ class LaunchInstance(workflows.Workflow):
default_steps = (workflows_create_instance.SelectProjectUser,
workflows_create_instance.SetInstanceDetails,
SetAccessControls,
SetGroup,
workflows_create_instance.PostCreationStep,
workflows_create_instance.SetAdvanced)
@ -417,7 +473,6 @@ class LaunchInstance(workflows.Workflow):
@sensitive_variables('context')
def handle(self, request, context):
custom_script = context.get('script_data', '')
dev_mapping_1 = None
dev_mapping_2 = None
@ -474,7 +529,6 @@ class LaunchInstance(workflows.Workflow):
]
avail_zone = context.get('availability_zone', None)
try:
policy_target_id = self.request.path.split("/")[-2]
instance_count = int(context['count'])
count = 1
while count <= instance_count:
@ -482,9 +536,12 @@ class LaunchInstance(workflows.Workflow):
instance_name = context['name']
else:
instance_name = context['name'] + str(count)
ep = client.pt_create(
request, policy_target_group_id=policy_target_id,
name=instance_name[:41] + "_gbpui")
nics = []
for ptg_id in context['group_id']:
ep = client.pt_create(
request, policy_target_group_id=ptg_id,
name=instance_name[:41] + "_gbpui")
nics.append({'port-id': ep.port_id})
api.nova.server_create(request,
instance_name,
image_id,
@ -494,7 +551,7 @@ class LaunchInstance(workflows.Workflow):
security_groups=None,
block_device_mapping=dev_mapping_1,
block_device_mapping_v2=dev_mapping_2,
nics=[{'port-id': ep.port_id}],
nics=nics,
availability_zone=avail_zone,
instance_count=1,
admin_pass=context['admin_pass'],
@ -507,6 +564,7 @@ class LaunchInstance(workflows.Workflow):
msg = error % {'count': count, 'name': instance_name}
LOG.error(msg)
u = "horizon:project:policytargets:policy_targetdetails"
policy_target_id = self.request.path.split("/")[-2]
redirect = reverse(u, kwargs={'policy_target_id':
policy_target_id})
exceptions.handle(request, msg, redirect=redirect)