19073547 editing built-in flavors fails with name too long
authorDrew Fisher <drew.fisher@oracle.com>
Fri, 27 Jun 2014 10:51:53 -0600
changeset 1978 e9a8064da9fd
parent 1977 12e9c20eef5a
child 1979 bdbb0de8834e
19073547 editing built-in flavors fails with name too long
components/openstack/horizon/patches/06-remove-console.patch
components/openstack/horizon/patches/07-remove-console.patch
components/openstack/horizon/patches/08-flavor-names.patch
--- a/components/openstack/horizon/patches/06-remove-console.patch	Thu Jun 26 19:18:52 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-In-house patch to remove the ">> open console" link from instance
-elements in the Network Topology screen.  This patch is
-Solaris-specific and not suitable for upstream contribution.
-
---- horizon-2013.2.3/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html.orig    2014-06-20 08:04:57.394535111 -0600
-+++ horizon-2013.2.3/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html     2014-06-20 08:05:47.621066190 -0600
[email protected]@ -16,7 +16,6 @@
-       <div class="cell link">
-         <a href="[[url]]">» view [[type]] details</a>
-         [[#console_id]]
--        <a href="[[url]][[console]]" class="vnc_window">» open console</a>
-         [[/console_id]]
-       </div>
-       <div class="cell delete">
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openstack/horizon/patches/07-remove-console.patch	Fri Jun 27 10:51:53 2014 -0600
@@ -0,0 +1,15 @@
+In-house patch to remove the ">> open console" link from instance
+elements in the Network Topology screen.  This patch is
+Solaris-specific and not suitable for upstream contribution.
+
+--- horizon-2013.2.3/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html.orig    2014-06-20 08:04:57.394535111 -0600
++++ horizon-2013.2.3/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html     2014-06-20 08:05:47.621066190 -0600
[email protected]@ -16,7 +16,6 @@
+       <div class="cell link">
+         <a href="[[url]]">» view [[type]] details</a>
+         [[#console_id]]
+-        <a href="[[url]][[console]]" class="vnc_window">» open console</a>
+         [[/console_id]]
+       </div>
+       <div class="cell delete">
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openstack/horizon/patches/08-flavor-names.patch	Fri Jun 27 10:51:53 2014 -0600
@@ -0,0 +1,41 @@
+In-house patch to increate the maximum length of Flavor names, Flavor
+keys, and Flavor values.  This patch has not yet been submitted
+upstream.
+
+--- horizon-2013.2.3/openstack_dashboard/dashboards/admin/flavors/workflows.py.orig       2014-06-27 09:55:09.196764242 -0600
++++ horizon-2013.2.3/openstack_dashboard/dashboards/admin/flavors/workflows.py        2014-06-27 09:55:12.447224496 -0600
[email protected]@ -35,7 +35,7 @@
+                              "Leave this field blank or use 'auto' to set "
+                              "a random UUID4.")
+     name = forms.RegexField(label=_("Name"),
+-                            max_length=25,
++                            max_length=255,
+                             regex=r'^[\w\.\- ]+$',
+                             error_messages={'invalid': _('Name may only '
+                                 'contain letters, numbers, underscores, '
+
+--- horizon-2013.2.3/openstack_dashboard/dashboards/admin/flavors/extras/forms.py.orig   2014-06-27 09:57:05.195849313 -0600
++++ horizon-2013.2.3/openstack_dashboard/dashboards/admin/flavors/extras/forms.py    2014-06-27 09:57:19.351010746 -0600
[email protected]@ -28,8 +28,8 @@
+ 
+ 
+ class CreateExtraSpec(forms.SelfHandlingForm):
+-    key = forms.CharField(max_length="25", label=_("Key"))
+-    value = forms.CharField(max_length="25", label=_("Value"))
++    key = forms.CharField(max_length="255", label=_("Key"))
++    value = forms.CharField(max_length="255", label=_("Value"))
+     flavor_id = forms.CharField(widget=forms.widgets.HiddenInput)
+ 
+     def handle(self, request, data):
[email protected]@ -46,8 +46,8 @@
+ 
+ 
+ class EditExtraSpec(forms.SelfHandlingForm):
+-    key = forms.CharField(max_length="25", label=_("Key"))
+-    value = forms.CharField(max_length="25", label=_("Value"))
++    key = forms.CharField(max_length="255", label=_("Key"))
++    value = forms.CharField(max_length="255", label=_("Value"))
+     flavor_id = forms.CharField(widget=forms.widgets.HiddenInput)
+ 
+     def handle(self, request, data):
+