Node Group Templates dialog improvement

No floating ip pool option is default now while creating a template

Copy template dialog now sets initial value for floating ip pool
correctly.

Change-Id: Icc0cb29f4417b9c2463d261ee3bbbb860615883d
Fixes: bug #1246893

savannadashboard/nodegroup_templates/workflows/copy.py

@@ -63,6 +63,9 @@ def __init__(self, request, context_seed, entry_point, *args, **kwargs):
             fields["volumes_per_node"].initial = volumes_per_node
             fields["volumes_size"].initial = volumes_size
 
+            if template.floating_ip_pool:
+                fields['floating_ip_pool'].initial = template.floating_ip_pool
+
             processes_dict = dict()
             plugin_details = savanna.plugins.get_version_details(
                 plugin,

savannadashboard/nodegroup_templates/workflows/create.py

@@ -96,19 +96,13 @@ def __init__(self, request, *args, **kwargs):
                     (str(service) + ":" + str(process), process))
 
         if not savannaclient.AUTO_ASSIGNMENT_ENABLED:
-            pools = []
-            pools.append((None, "Do not assign floating IPs"))
-
-            pools_list = network.floating_ip_pools_list(request)
-            first_pool_id = None
-            for pool in pools_list:
-                if not first_pool_id:
-                    first_pool_id = pool.id
-                pools.append((pool.id, pool.name))
+            pools = network.floating_ip_pools_list(request)
+            pool_choices = [(pool.name, pool.name) for pool in pools]
+            pool_choices.insert(0, (None, "Do not assign floating IPs"))
+
             self.fields['floating_ip_pool'] = forms.ChoiceField(
                 label=_("Floationg IP pool"),
-                choices=pools,
-                initial=first_pool_id,
+                choices=pool_choices,
                 required=False)
 
         self.fields["processes"] = forms.MultipleChoiceField(