From 0011eb6130193104b17b0cfcdc149ceff790ddc6 Mon Sep 17 00:00:00 2001
From: Shu Yingya <shuyingya@gmail.com>
Date: Mon, 27 Mar 2017 18:31:28 +0800
Subject: [PATCH] Fix bugs of redirect url

Horizon has some changes as bellow about security group and keypairs.
Sahara-dashboard should sync the location of resource with horizon.

* Move Security Groups into its own panel
	https://review.openstack.org/#/c/427882/
* Make Key Pairs tab a panel under Compute:
	 https://review.openstack.org/#/c/408247/

Change-Id: I705e2feff090acd1d17e58b3d77c185fd0006c19
---
 .../data_processing/clusters/clusters/workflows/create.py       | 2 +-
 .../templates/cluster_templates/_nodegroups_details.html        | 2 +-
 .../clusters/templates/clusters/_nodegroups_details.html        | 2 +-
 .../clusters/templates/nodegroup_templates/_details.html        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sahara_dashboard/content/data_processing/clusters/clusters/workflows/create.py b/sahara_dashboard/content/data_processing/clusters/clusters/workflows/create.py
index 6c0d0cc0..d37143e4 100644
--- a/sahara_dashboard/content/data_processing/clusters/clusters/workflows/create.py
+++ b/sahara_dashboard/content/data_processing/clusters/clusters/workflows/create.py
@@ -30,7 +30,7 @@ import sahara_dashboard.content.data_processing.clusters. \
     cluster_templates.workflows.create as t_flows
 
 
-KEYPAIR_IMPORT_URL = "horizon:project:access_and_security:keypairs:import"
+KEYPAIR_IMPORT_URL = "horizon:project:key_pairs:import"
 BASE_IMAGE_URL = "horizon:project:data_processing.clusters:register"
 TEMPLATE_UPLOAD_URL = (
     "horizon:project:data_processing.clusters:upload_file")
diff --git a/sahara_dashboard/content/data_processing/clusters/templates/cluster_templates/_nodegroups_details.html b/sahara_dashboard/content/data_processing/clusters/templates/cluster_templates/_nodegroups_details.html
index 824c44e5..e96ab51c 100644
--- a/sahara_dashboard/content/data_processing/clusters/templates/cluster_templates/_nodegroups_details.html
+++ b/sahara_dashboard/content/data_processing/clusters/templates/cluster_templates/_nodegroups_details.html
@@ -36,7 +36,7 @@
                 <ul class="list-bullet">
                     {% for group in node_group.security_groups_full %}
                         {% if group.id %}
-                            <li><a href="{% url 'horizon:project:access_and_security:security_groups:detail' group.id %}">{{ group.name }}</a></li>
+                            <li><a href="{% url 'horizon:project:security_groups:detail' group.id %}">{{ group.name }}</a></li>
                         {% else %}
                             <li>{{ group.name }}</li>
                         {% endif %}
diff --git a/sahara_dashboard/content/data_processing/clusters/templates/clusters/_nodegroups_details.html b/sahara_dashboard/content/data_processing/clusters/templates/clusters/_nodegroups_details.html
index 080bf86b..795929f7 100644
--- a/sahara_dashboard/content/data_processing/clusters/templates/clusters/_nodegroups_details.html
+++ b/sahara_dashboard/content/data_processing/clusters/templates/clusters/_nodegroups_details.html
@@ -38,7 +38,7 @@
                 <ul class="list-bullet" id="sahara-bullet-list">
                     {% for group in node_group.security_groups_full %}
                         {% if group.id %}
-                            <li><a href="{% url 'horizon:project:access_and_security:security_groups:detail' group.id %}">{{ group.name }}</a></li>
+                            <li><a href="{% url 'horizon:project:security_groups:detail' group.id %}">{{ group.name }}</a></li>
                         {% else %}
                             <li>{{ group.name }}</li>
                         {% endif %}
diff --git a/sahara_dashboard/content/data_processing/clusters/templates/nodegroup_templates/_details.html b/sahara_dashboard/content/data_processing/clusters/templates/nodegroup_templates/_details.html
index 4ba08740..1e07745a 100644
--- a/sahara_dashboard/content/data_processing/clusters/templates/nodegroup_templates/_details.html
+++ b/sahara_dashboard/content/data_processing/clusters/templates/nodegroup_templates/_details.html
@@ -65,7 +65,7 @@
         <ul class="list-bullet">
             {% for group in security_groups %}
                 {% if group.id %}
-                    <li><a href="{% url 'horizon:project:access_and_security:security_groups:detail' group.id %}">{{ group.name }}</a></li>
+                    <li><a href="{% url 'horizon:project:security_groups:detail' group.id %}">{{ group.name }}</a></li>
                 {% else %}
                     <li>{{ group.name }}</li>
                 {% endif %}