From 7aad32e83ebea1d134f31ee3678a0b7c87764eda Mon Sep 17 00:00:00 2001
From: Bence Romsics <bence.romsics@ericsson.com>
Date: Thu, 27 Jul 2017 09:37:00 +0200
Subject: [PATCH] Trunks panel: default to disabled

Unfortunately we missed to complete the trunks panel until the Pike
freeze. Since it is incomplete we better disable it by default.
The merged part is working though, users can view and delete trunks.
The panel can be re-enabled by deleting the DISABLED flag from the
file enabling the panel:

openstack_dashboard/enabled/_1500_project_trunks_panel.py

Change-Id: I956c10666f0449478e3489f13d7eff049ad95890
Partially-Implements: blueprint neutron-trunk-ui
---
 .../enabled/_1500_project_trunks_panel.py       | 17 +++++++++++++++++
 .../bp-neutron-trunk-ui-72e05888e68502c4.yaml   | 14 +++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/openstack_dashboard/enabled/_1500_project_trunks_panel.py b/openstack_dashboard/enabled/_1500_project_trunks_panel.py
index 1775743815..e357a0edce 100644
--- a/openstack_dashboard/enabled/_1500_project_trunks_panel.py
+++ b/openstack_dashboard/enabled/_1500_project_trunks_panel.py
@@ -1,3 +1,17 @@
+# Copyright 2017 Ericsson
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # The slug of the panel to be added to HORIZON_CONFIG. Required.
 PANEL = 'trunks'
 # The slug of the dashboard the PANEL associated with. Required.
@@ -8,3 +22,6 @@ PANEL_GROUP = 'network'
 # Python panel class of the PANEL to be added.
 ADD_PANEL = \
     'openstack_dashboard.dashboards.project.trunks.panel.Trunks'
+
+# Will default to disabled until the feature is completed.
+DISABLED = True
diff --git a/releasenotes/notes/bp-neutron-trunk-ui-72e05888e68502c4.yaml b/releasenotes/notes/bp-neutron-trunk-ui-72e05888e68502c4.yaml
index b1dd6d0ddd..f6f6cb3b25 100644
--- a/releasenotes/notes/bp-neutron-trunk-ui-72e05888e68502c4.yaml
+++ b/releasenotes/notes/bp-neutron-trunk-ui-72e05888e68502c4.yaml
@@ -2,10 +2,10 @@
 features:
   - |
     [`blueprint neutron-trunk-ui <https://blueprints.launchpad.net/horizon/+spec/neutron-trunk-ui>`_]
-    Add partial support for Neutron Trunks. Since the panel is
-    incomplete in Pike, it is disabled by default. An example 'enabled'
-    file is supplied.  After enabling it the Project/Network/Trunks
-    panel turns on if Neutron API extension 'trunk' is available. It
-    displays information about trunks. The details page for each trunk
-    also shows information about subports of that trunk.
-    Currently supported actions: delete.
+    Add partial support for Neutron Trunks. Since the panel is incomplete
+    in Pike, it is disabled by default. It can be enabled in the file
+    'openstack_dashboard/enabled/_1500_project_trunks_panel.py'. After
+    enabling it the Project/Network/Trunks panel turns on if Neutron
+    API extension 'trunk' is available. It displays information about
+    trunks. The details page for each trunk also shows information about
+    subports of that trunk. Currently supported actions: delete.