Rename service_catalog dirs to packages.

Only one file change (dashboard.py), renaming files en masse in a
separate commit should make subsequent commits a bit cleaner.

Also temporarily disable getting data from apiary (it is broken now).

Change-Id: I9b8fd02a898e9bc9f9383652f793b99c6bc3778f
Partially-implements: blueprint service-defitions-migrate-to-apps-ui

muranodashboard/catalog/models.py

@@ -62,7 +62,10 @@ class AppCatalogObjects(object):
         self.app_list = datastructures.SortedDict()
         self.url = url
         string = self.query(url)
-        data = json.loads(string)
+        try:
+            data = json.loads(string)
+        except:
+            data = {'packages': []}
         for dct in data['packages']:
             dct['image'] = get_image_name()
             app = Application(dct)

muranodashboard/dashboard.py

@@ -27,7 +27,7 @@ class DeployPanels(horizon.PanelGroup):
 class ManagePanels(horizon.PanelGroup):
     slug = 'manage_metadata'
     name = _('Manage')
-    panels = ('images', 'service_catalog')
+    panels = ('images', 'packages')
 
 
 class Murano(horizon.Dashboard):

muranodashboard/packages/panel.py

@@ -19,7 +19,7 @@ from muranodashboard import dashboard
 
 class ServiceCatalog(horizon.Panel):
     name = _("Service Definitions")
-    slug = 'service_catalog'
+    slug = 'packages'
 
 
 dashboard.Murano.register(ServiceCatalog)

muranodashboard/packages/views.py

@@ -35,7 +35,7 @@ LOG = logging.getLogger(__name__)
 
 class ServiceCatalogView(tables.DataTableView):
     table_class = ServiceCatalogTable
-    template_name = 'service_catalog/index.html'
+    template_name = 'packages/index.html'
 
     def get_data(self):
         services, request = [], self.request
@@ -47,14 +47,14 @@ class ServiceCatalogView(tables.DataTableView):
 
 class UploadServiceView(ModalFormView):
     form_class = UploadServiceForm
-    template_name = 'service_catalog/upload_service.html'
+    template_name = 'packages/upload_service.html'
     context_object_name = 'service_catalog'
     success_url = reverse_lazy('horizon:murano:service_catalog:index')
 
 
 class ManageFilesView(tables.DataTableView):
     table_class = MetadataObjectsTable
-    template_name = 'service_catalog/files.html'
+    template_name = 'packages/files.html'
 
     def get_data(self):
         files, request = [], self.request
@@ -112,7 +112,7 @@ class ComposeServiceView(WorkflowView):
 
 
 class UploadFileView2(ModalFormView):
-    template_name = 'service_catalog/upload_file2.html'
+    template_name = 'packages/upload_file2.html'
     form_class = UploadFileToService
     success_url = 'horizon:murano:service_catalog:manage_service'
 
@@ -134,13 +134,13 @@ class UploadFileView2(ModalFormView):
 
 class UploadFileView(ModalFormView):
     form_class = UploadFileForm
-    template_name = 'service_catalog/upload_file.html'
+    template_name = 'packages/upload_file.html'
     context_object_name = 'manage_files'
     success_url = reverse_lazy('horizon:murano:service_catalog:manage_files')
 
 
 class ManageServiceView(tables.MultiTableView):
-    template_name = 'service_catalog/service_files.html'
+    template_name = 'packages/service_files.html'
     failure_url = reverse_lazy('horizon:murano:service_catalog:index')
 
     def dispatch(self, request, *args, **kwargs):

muranodashboard/templates/packages/_workflow_step.html

@@ -3,7 +3,7 @@
   <tbody>
     <tr>
       <td class="actions">
-          {% include "service_catalog/_form_fields_simple.html" %}
+          {% include "packages/_form_fields_simple.html" %}
       </td>
       <td class="help_text">
           {{ step.get_help_text }}

muranodashboard/templates/packages/service_files.html

@@ -11,7 +11,7 @@
 {% endblock page_header %}
 
 {% block main %}
-  {% include "service_catalog/_detail_overview.html" %}
+  {% include "packages/_detail_overview.html" %}
   <hr>
   <div id="ui">
     {{ ui_table.render }}

muranodashboard/templates/packages/upload_file.html

@@ -7,5 +7,5 @@
 {% endblock page_header %}
 
 {% block main %}
-  {% include 'service_catalog/_upload_file.html' %}
+  {% include 'packages/_upload_file.html' %}
 {% endblock %}

muranodashboard/templates/packages/upload_file2.html

@@ -7,5 +7,5 @@
 {% endblock page_header %}
 
 {% block main %}
-  {% include 'service_catalog/_upload_file2.html' %}
+  {% include 'packages/_upload_file2.html' %}
 {% endblock %}

muranodashboard/templates/packages/upload_service.html

@@ -7,5 +7,5 @@
 {% endblock page_header %}
 
 {% block main %}
-  {% include 'service_catalog/_upload_service.html' %}
+  {% include 'packages/_upload_service.html' %}
 {% endblock %}