several changes on auth flow
Change-Id: I49ddbb074a9bc018b9e5becafbe5956fa5860333
Signed-off-by: lombardofr <lombardo@everyup.it>
diff --git a/instancehandler/template/instance_list.html b/instancehandler/template/instance_list.html
index 9baae4c..5888519 100644
--- a/instancehandler/template/instance_list.html
+++ b/instancehandler/template/instance_list.html
@@ -25,7 +25,7 @@
{% block breadcrumb_body %}
{{ block.super }}
- <li><a href="{% url 'projects:instances:list' project_id=project_id type=type %}">{{ type|upper }} Instances</a></li>
+ <li><a href="{% url 'projects:instances:list' type=type %}">{{ type|upper }} Instances</a></li>
{% endblock %}
{% block content_body %}
diff --git a/instancehandler/template/instance_list_ns.html b/instancehandler/template/instance_list_ns.html
index dd84d47..2da870d 100644
--- a/instancehandler/template/instance_list_ns.html
+++ b/instancehandler/template/instance_list_ns.html
@@ -7,7 +7,7 @@
<button type="button" class="btn btn-default" data-container="body"
data-toggle="tooltip" data-placement="top" title="Instantiate NS"
- onclick="javascript:openModalCreateNS({ 'project_id':'{{ project_id }}','vim_list_url': '{% url "projects:vims:list" project_id=project_id %}', 'nsd_list_url': '{% url "projects:list_descriptors" project_id=project_id descriptor_type='nsd' %}'})">
+ onclick="javascript:openModalCreateNS({ 'project_id':'{{ project_id }}','vim_list_url': '{% url "projects:vims:list" %}', 'nsd_list_url': '{% url "projects:list_descriptors" descriptor_type='nsd' %}'})">
<i class="fa fa-paper-plane"></i> <span> New NS</span></button>
</div>
@@ -58,14 +58,20 @@
<td>
<div class="btn-group">
<button type="button" class="btn btn-default"
- onclick="javascript:showInstanceDetails('{% url 'projects:instances:show' instance_id=i|get:'_id' project_id=project_id type=type %}')"
+ onclick="javascript:showInstanceDetails('{% url 'projects:instances:show' instance_id=i|get:'_id' type=type %}')"
data-toggle="tooltip" data-placement="top" data-container="body" title="Show Info">
- <i
- class="fa fa-info"></i>
+ <i class="fa fa-info"></i>
</button>
+ <!--
+ <button type="button" class="btn btn-default"
+ onclick="javascript:showInstanceTopology('{% url 'projects:instances:show_topology' instance_id=i|get:'_id' type=type %}')"
+ data-toggle="tooltip" data-placement="top" data-container="body" title="Show Topology">
+ <i class="fa fa-sitemap"></i>
+ </button>
+ -->
<button type="button" class="btn btn-default"
- onclick="javascript:deleteNs('{% url 'projects:instances:delete' instance_id=i|get:'_id' project_id=project_id type=type %}')"
+ onclick="javascript:deleteNs('{% url 'projects:instances:delete' instance_id=i|get:'_id' type=type %}')"
data-toggle="tooltip" data-placement="top" data-container="body" title="Delete"><i
class="far fa-trash-alt"></i></button>
@@ -74,21 +80,21 @@
<span class="fa fa-caret-down"></span></button>
<ul class="dropdown-menu">
<li><a href="#"
- onclick="javascript:performAction('{% url 'projects:instances:action' instance_id=i|get:'_id' project_id=project_id type=type %}')">
+ onclick="javascript:performAction('{% url 'projects:instances:action' instance_id=i|get:'_id' type=type %}')">
<i class="fa fa-magic"></i> Exec NS Primitive</a></li>
<li>
- <a href="{% url 'projects:instances:ns_operations' project_id=project_id type=type instance_id=i|get:'_id' %}">
+ <a href="{% url 'projects:instances:ns_operations' type=type instance_id=i|get:'_id' %}">
<i class="fa fa-list"></i> Active operations</a></li>
<li class="divider"></li>
<li><a href="#"
- onclick="javascript:newAlarmNs('{% url 'projects:instances:ns_create_alarm' instance_id=i|get:'_id' project_id=project_id type=type %}')">
+ onclick="javascript:newAlarmNs('{% url 'projects:instances:ns_create_alarm' instance_id=i|get:'_id' type=type %}')">
<i class="far fa-bell"></i> New Alarm</a></li>
<li><a href="#"
- onclick="javascript:exportMetricNs('{% url 'projects:instances:ns_export_metric' instance_id=i|get:'_id' project_id=project_id type=type %}')">
+ onclick="javascript:exportMetricNs('{% url 'projects:instances:ns_export_metric' instance_id=i|get:'_id' type=type %}')">
<i class="far fa-chart-bar"></i> Export metric</a></li>
<li class="divider"></li>
<li>
- <a href="javascript:deleteNs('{% url 'projects:instances:delete' instance_id=i|get:'_id' project_id=project_id type=type %}', true)">
+ <a href="javascript:deleteNs('{% url 'projects:instances:delete' instance_id=i|get:'_id' type=type %}', true)">
<i class="far fa-trash-alt" style="color:red" ></i> Force delete</a></li>
</ul>
diff --git a/instancehandler/template/instance_list_vnf.html b/instancehandler/template/instance_list_vnf.html
index 4aa084e..410fcb0 100644
--- a/instancehandler/template/instance_list_vnf.html
+++ b/instancehandler/template/instance_list_vnf.html
@@ -29,7 +29,7 @@
<tr>
<td>{{ i|get:"_id" }}</td>
- <td><a href="javascript:openDescriptorView('{{project_id}}', 'vnfd', '{{ i|get:"vnfd-id" }}')"> {{ i|get:"vnfd-ref" }}</a></td>
+ <td><a href="javascript:openDescriptorView('vnfd', '{{ i|get:"vnfd-id" }}')"> {{ i|get:"vnfd-ref" }}</a></td>
<td>{{ i|get:"member-vnf-index-ref" }}</td>
<td class="ellipsis" data-text="{{ i|get:"nsr-id-ref" }}">{{ i|get:"nsr-id-ref" }}</td>
<td >{{ i|get:"created-time"|get_date }}</td>
@@ -37,7 +37,7 @@
<td>
<div class="btn-group">
<button type="button" class="btn btn-default"
- onclick="javascript:showInstanceDetails('{% url 'projects:instances:show' instance_id=i|get:'_id' project_id=project_id type=type %}')"
+ onclick="javascript:showInstanceDetails('{% url 'projects:instances:show' instance_id=i|get:'_id' type=type %}')"
data-toggle="tooltip" data-placement="top" data-container="body" title="Show Info">
<i class="fa fa-info"></i>
</button>
diff --git a/instancehandler/template/instance_operations_list.html b/instancehandler/template/instance_operations_list.html
index 4115e0d..e72b56c 100644
--- a/instancehandler/template/instance_operations_list.html
+++ b/instancehandler/template/instance_operations_list.html
@@ -25,7 +25,7 @@
{% block breadcrumb_body %}
{{ block.super }}
- <li><a href="{% url 'projects:instances:list' project_id=project_id type=type %}">Instances</a></li>
+ <li><a href="{% url 'projects:instances:list' type=type %}">Instances</a></li>
{% endblock %}
{% block content_body %}
@@ -74,7 +74,7 @@
<td>
<div class="btn-group">
<button type="button" class="btn btn-default"
- onclick="javascript:showOperationDetails('{% url 'projects:instances:ns_operation' op_id=i|get:'_id' instance_id=i|get:'nsInstanceId' project_id=project_id type=type %}')"
+ onclick="javascript:showOperationDetails('{% url 'projects:instances:ns_operation' op_id=i|get:'_id' instance_id=i|get:'nsInstanceId' type=type %}')"
data-toggle="tooltip" data-placement="top" data-container="body" title="More Info"><i
class="fa fa-info"></i>
</button>
diff --git a/instancehandler/template/instance_topology_view.html b/instancehandler/template/instance_topology_view.html
new file mode 100644
index 0000000..627770d
--- /dev/null
+++ b/instancehandler/template/instance_topology_view.html
@@ -0,0 +1,79 @@
+{% extends "base.html" %}
+{% load get %}
+{% load staticfiles %}
+
+
+
+{% block head_block %}
+ {{ block.super }}
+ <link rel="stylesheet" href="/static/bower_components/select2/dist/css/select2.min.css">
+ <link rel="stylesheet" href="/static/css/lwuitable.css">
+
+ <!-- Topology3D core CSS -->
+ <link rel="stylesheet" href="/static/topology3D/css/graph_editor_d3js.css">
+ <link rel="stylesheet" href="/static/topology3D/css/d3-context-menu.css">
+
+{% endblock %}
+{% block title_header_big %}
+ {{ block.super }}
+{% endblock %}
+{% block left_sidebar %}
+ {% include 'osm/osm_project_left_sidebar.html' %}
+{% endblock %}
+
+
+{% block breadcrumb_body %}
+ {{ block.super }}
+ <li><a href="{% url 'projects:instances:list' type=type %}">{{ type|upper }} Instances</a></li>
+ <li><a href="#"><i class="fa fa-sitemap"></i> {{ type|upper }} Topology</a></li>
+{% endblock %}
+
+{% block content_body %}
+ {{ block.super }}
+ {% csrf_token %}
+
+ <div class="row" >
+ <div class="col-md-12">
+ {% block topology_toolbar %}
+ {{ block.super }}
+ {% include 'topology_toolbar_instance.html' %}
+ {% endblock %}
+ <div id="graph_ed_container" style="width: 100%; height:100%; background-color: white; border: 2px #3c8dbc solid;">
+
+ </div>
+ </div>
+ </div>
+
+
+
+{% endblock %}
+
+{% block resource_block %}
+ {{ block.super }}
+ <script>
+ var topology_data = {};//{{topology_data|safe }};
+ </script>
+ <!-- Utility JS -->
+ <script src="/static/bower_components/select2/dist/js/select2.js"></script>
+
+ <!-- d3.js -->
+ <script src="https://d3js.org/d3.v4.js"></script>
+<!--
+ <script src="/static/bower_components/d3/d3.js"></script>-->
+
+ <!-- topology3D -->
+ <script src="/static/topology3D/js/d3-context-menu.js"></script>
+ <script src="/static/topology3D/js/event.js"></script>
+ <script src="/static/topology3D/js/graph_editor.js"></script>
+ <script src="/static/topology3D/js/graph_request.js"></script>
+ <script src="/static/topology3D/js/model_graph_editor.js"></script>
+
+
+ <script src="/static/src/osm_gui_properties.js"></script>
+ <script src="/static/src/instancehandler/instance_topology_view.js"></script>
+
+{% endblock %}
+
+{% block footer %}
+ {% include "footer.html" %}
+{% endblock %}
diff --git a/instancehandler/template/modal/instance_create.html b/instancehandler/template/modal/instance_create.html
index f1c24d9..384e782 100644
--- a/instancehandler/template/modal/instance_create.html
+++ b/instancehandler/template/modal/instance_create.html
@@ -6,7 +6,7 @@
<span aria-hidden="true">×</span></button>
<h4 class="modal-title">New Instance</h4>
</div>
- <form id="formCreateNS" action='{% url "projects:instances:create" project_id=project_id %}'
+ <form id="formCreateNS" action='{% url "projects:instances:create" %}'
class="form-horizontal"
method="post" enctype="multipart/form-data">
{% csrf_token %}