Feature 8178 VNF Repositories 55/8855/1
authormelian <javier.melian@atos.net>
Wed, 6 May 2020 09:53:27 +0000 (09:53 +0000)
committermelian <javier.melian@atos.net>
Wed, 6 May 2020 09:53:27 +0000 (09:53 +0000)
Change-Id: Ic1e34107157fe346df47755ad19a8101c25a0449
Signed-off-by: melian <javier.melian@atos.net>
15 files changed:
build-debpkg.sh
lib/osm/osmclient/clientv2.py
osmrepohandler/__init__.py [new file with mode: 0644]
osmrepohandler/apps.py [new file with mode: 0644]
osmrepohandler/models.py [new file with mode: 0644]
osmrepohandler/template/modal/osmrepo_details.html [new file with mode: 0644]
osmrepohandler/template/modal/osmrepo_register.html [new file with mode: 0644]
osmrepohandler/template/modal/osmrepo_update.html [new file with mode: 0644]
osmrepohandler/template/osmrepo_list.html [new file with mode: 0644]
osmrepohandler/urls.py [new file with mode: 0644]
osmrepohandler/views.py [new file with mode: 0644]
projecthandler/template/project/osm/osm_project_left_sidebar.html
sf_t3d/settings.py
sf_t3d/urls.py
static/src/osmrepohandler/osmrepos_list.js [new file with mode: 0644]

index 90553c3..f2c7af2 100755 (executable)
@@ -15,7 +15,7 @@
 #    under the License.
 
 
-PKG_DIRECTORIES="authosm descriptorhandler instancehandler lib projecthandler sdnctrlhandler sf_t3d static template userhandler vimhandler packagehandler netslicehandler wimhandler rolehandler k8sclusterhandler k8srepohandler"
+PKG_DIRECTORIES="authosm descriptorhandler instancehandler lib projecthandler sdnctrlhandler sf_t3d static template userhandler vimhandler packagehandler netslicehandler wimhandler rolehandler k8sclusterhandler k8srepohandler osmrepohandler"
 PKG_FILES="bower.json django.ini LICENSE manage.py nginx-app.conf README.md requirements.txt supervisor-app.conf .bowerrc entrypoint.sh package.json"
 MDG_NAME=lightui
 DEB_INSTALL=debian/osm-${MDG_NAME}.install
index db37e49..9e9973c 100644 (file)
@@ -1838,6 +1838,97 @@ class Client(object):
             result['data'] = Util.json_loads_byteified(r.text)
         return result
 
+    def osmr_get(self, token, id):
+        result = {'error': True, 'data': ''}
+        headers = {"accept": "application/json",
+                   'Authorization': 'Bearer {}'.format(token['id'])}
+        _url = "{0}/admin/v1/osmrepos/{1}".format(self._base_path, id)
+        try:
+            r = requests.get(_url, params=None, verify=False,
+                             stream=True, headers=headers)
+        except Exception as e:
+            log.exception(e)
+            result['data'] = str(e)
+            return result
+        if r.status_code in (200, 201, 202, 204):
+            result['error'] = False
+        result['data'] = Util.json_loads_byteified(r.text)
+        return result
+
+    def osmr_list(self, token):
+        result = {'error': True, 'data': ''}
+        headers = {"accept": "application/json",
+                   'Authorization': 'Bearer {}'.format(token['id'])}
+        _url = "{0}/admin/v1/osmrepos".format(self._base_path)
+        try:
+            r = requests.get(_url, params=None, verify=False,
+                             stream=True, headers=headers)
+        except Exception as e:
+            log.exception(e)
+            result['data'] = str(e)
+            return result
+        if r.status_code in (200, 201, 202, 204):
+            result['error'] = False
+        result['data'] = Util.json_loads_byteified(r.text)
+        return result
+
+    def osmr_create(self, token, cluster_data):
+        result = {'error': True, 'data': ''}
+        headers = {"Content-Type": "application/json", "accept": "application/json",
+                   'Authorization': 'Bearer {}'.format(token['id'])}
+
+        _url = "{0}/admin/v1/osmrepos".format(self._base_path)
+
+        try:
+            r = requests.post(_url, json=cluster_data,
+                              verify=False, headers=headers)
+        except Exception as e:
+            log.exception(e)
+            result['data'] = str(e)
+            return result
+        if r.status_code in (200, 201, 202, 204):
+            result['error'] = False
+        result['data'] = Util.json_loads_byteified(r.text)
+        return result
+
+    def osmr_update(self, token, id, cluster_data):
+        result = {'error': True, 'data': ''}
+        headers = {"Content-Type": "application/json", "accept": "application/json",
+                   'Authorization': 'Bearer {}'.format(token['id'])}
+
+        _url = "{0}/admin/v1/osmrepos/{1}".format(self._base_path, id)
+        try:
+            r = requests.patch(_url, json=cluster_data,
+                               verify=False, headers=headers)
+        except Exception as e:
+            log.exception(e)
+            result['data'] = str(e)
+            return result
+        if r.status_code in (200, 201, 202, 204):
+            result['error'] = False
+        else:
+            result['data'] = Util.json_loads_byteified(r.text)
+        return result
+
+    def osmr_delete(self, token, id):
+        result = {'error': True, 'data': ''}
+        headers = {"Content-Type": "application/yaml", "accept": "application/json",
+                   'Authorization': 'Bearer {}'.format(token['id'])}
+
+        _url = "{0}/admin/v1/osmrepos/{1}".format(self._base_path, id)
+        try:
+            r = requests.delete(_url, params=None,
+                                verify=False, headers=headers)
+        except Exception as e:
+            log.exception(e)
+            result['data'] = str(e)
+            return result
+        if r.status_code in (200, 201, 202, 204):
+            result['error'] = False
+        else:
+            result['data'] = Util.json_loads_byteified(r.text)
+        return result
+
     @staticmethod
     def md5(f):
         hash_md5 = hashlib.md5()
diff --git a/osmrepohandler/__init__.py b/osmrepohandler/__init__.py
new file mode 100644 (file)
index 0000000..340b024
--- /dev/null
@@ -0,0 +1,15 @@
+#
+#   Copyright 2019 EveryUP Srl
+#
+#   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  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.
+#
\ No newline at end of file
diff --git a/osmrepohandler/apps.py b/osmrepohandler/apps.py
new file mode 100644 (file)
index 0000000..cc72e0a
--- /dev/null
@@ -0,0 +1,22 @@
+#
+#   Copyright 2019 EveryUP Srl
+#
+#   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  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.
+#
+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+
+
+class OSMrepohandlerConfig(AppConfig):
+    name = 'osmrepohandler'
diff --git a/osmrepohandler/models.py b/osmrepohandler/models.py
new file mode 100644 (file)
index 0000000..3199b61
--- /dev/null
@@ -0,0 +1,20 @@
+#
+#   Copyright 2019 EveryUP Srl
+#
+#   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  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.
+#
+from __future__ import unicode_literals
+
+from django.db import models
+
+# Create your models here.
diff --git a/osmrepohandler/template/modal/osmrepo_details.html b/osmrepohandler/template/modal/osmrepo_details.html
new file mode 100644 (file)
index 0000000..06a50c1
--- /dev/null
@@ -0,0 +1,39 @@
+<!--
+Copyright 2019 EveryUP srl
+
+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  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.
+-->
+
+<div class="modal" id="modal_show_osmr" xmlns="http://www.w3.org/1999/html">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span></button>
+                <h4 class="modal-title" >OSM Repository Details</h4>
+            </div>
+
+            <div class="modal-body" id="modal_show_osmr_body">
+                    <div class="modal-body" id="modal_show_osmr_body" >
+                            <textarea id="osmr_view_json">
+                            </textarea>
+                        </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+            </div>
+        </div>
+        <!-- /.modal-content -->
+    </div>
+    <!-- /.modal-dialog -->
+</div>
\ No newline at end of file
diff --git a/osmrepohandler/template/modal/osmrepo_register.html b/osmrepohandler/template/modal/osmrepo_register.html
new file mode 100644 (file)
index 0000000..5ead65d
--- /dev/null
@@ -0,0 +1,75 @@
+<!--
+Copyright 2019 EveryUP srl
+
+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  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.
+-->
+
+<div class="modal" id="modal_new_osmr" xmlns="http://www.w3.org/1999/html">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span></button>
+                <h4 class="modal-title">New OSM Repository</h4>
+            </div>
+            <form id="formCreateosmr" action='{% url "osmr:create" %}'
+                  class="form-horizontal"
+                  method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <div class="modal-body" id="modal_new_osmr_body">
+                    <div class="form-group">
+                        <label for="osmr_name" class="col-sm-2">Name *</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" id="osmr_name" name="name" placeholder="Name" required>
+                        </div>
+                        <label for="osmr_type" class="col-sm-2">Type *</label>
+                        <div class="col-sm-3">
+                            <select required id="osmr_type" name="type" class="form-control">
+                                <option value="osm">osm</option>
+                            </select>
+                        </div>
+                        
+                    </div> 
+                    
+
+                    <div class="form-group">
+                        <label for="osmr_url" class="col-sm-2">Url *</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" id="osmr_url" name="url"
+                                        placeholder="Url" required>
+                        </div>
+                        <label for="osmr_description" class="col-sm-2">Description *</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" id="osmr_description" name="description"
+                                        placeholder="Description" required>
+                        </div>
+                    </div>               
+
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal">Cancel</button>
+                    <button class="btn btn-primary"
+                            data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i> Creating..."
+                            id="create_new_osmr">Register
+                    </button>
+
+                </div>
+            </form>
+        </div>
+        <!-- /.modal-content -->
+    </div>
+    <!-- /.modal-dialog -->
+</div>
+
+
+
diff --git a/osmrepohandler/template/modal/osmrepo_update.html b/osmrepohandler/template/modal/osmrepo_update.html
new file mode 100644 (file)
index 0000000..d8dbb44
--- /dev/null
@@ -0,0 +1,15 @@
+<!--
+Copyright 2019 EveryUP srl
+
+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  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.
+-->
\ No newline at end of file
diff --git a/osmrepohandler/template/osmrepo_list.html b/osmrepohandler/template/osmrepo_list.html
new file mode 100644 (file)
index 0000000..709e599
--- /dev/null
@@ -0,0 +1,195 @@
+<!--
+Copyright 2019 EveryUP srl
+
+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  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.
+-->
+
+{% extends "base.html" %}
+{% load get %}
+{% load staticfiles %}
+
+
+{% block head_block %}
+    {{ block.super }}
+    <link rel="stylesheet" href="/static/node_modules/codemirror/lib/codemirror.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/fold/foldgutter.css" />
+    <link rel="stylesheet" href="/static/node_modules/codemirror/theme/neat.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/dialog/dialog.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/display/fullscreen.css">
+    <link rel="stylesheet" href="/static/node_modules/select2/dist/css/select2.min.css">
+    <link rel="stylesheet" href="/static/css/lwuitable.css">
+    <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.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 'osmr:list'  %}">OSM repository</a></li>
+{% endblock %}
+
+{% block content_body %}
+    {{ block.super }}
+    {% include 'modal/osmrepo_details.html' %}
+    {% include 'modal/osmrepo_register.html' %}
+    {% csrf_token %}
+    <div class="row">
+        <div class="col-md-12">
+
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">Registered OSM repository</h3>
+                    <div class="box-tools">
+                        <button type="button" class="btn btn-default" data-container="body"
+                            data-toggle="tooltip" data-placement="top" title="New OSM Repository"
+                            onclick="javascript:openModalRegisterOSMr({ 'project_id':'{{ project_id }}'})">
+                        <i class="fa fa-plus"></i> <span> Add OSM Repository</span>
+                        </button>
+                    </div>
+                </div>
+                <div class="box-body">
+                    <table id="osmr_table" class="table table-bordered table-striped">
+                        <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Identifier</th>
+                            <th>Url</th>
+                            <th>Type</th>
+                            <th>Created</th>
+                            <th>Modified</th>
+                            <th>Actions</th>
+
+                        </tr>
+                        </thead>
+                        <tbody>
+
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+
+    </div>
+{% endblock %}
+
+{% block resource_block %}
+    {{ block.super }}
+    <script src="/static/node_modules/select2/dist/js/select2.js"></script>
+    <script src="/static/node_modules/codemirror/lib/codemirror.js"></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldcode.js"></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldgutter.js"></script>
+    <script src="/static/node_modules/codemirror/addon/fold/brace-fold.js"></script>
+    <script src="/static/node_modules/codemirror/mode/javascript/javascript.js"></script>
+    <script src="/static/node_modules/codemirror/addon/search/searchcursor.js"></script>
+    <script src="/static/node_modules/codemirror/addon/search/search.js"></script>
+    <script src="/static/node_modules/codemirror/addon/dialog/dialog.js"></script>
+    <script src="/static/node_modules/codemirror/addon/display/autorefresh.js"></script>
+    <script src="/static/node_modules/codemirror/addon/edit/matchbrackets.js"></script>
+    <script src="/static/node_modules/codemirror/addon/edit/closebrackets.js"></script>
+    <script src="/static/node_modules/codemirror/addon/display/fullscreen.js"></script>
+    <script src="/static/node_modules/codemirror/keymap/sublime.js"></script>
+    <script src="/static/node_modules/moment/moment.js"></script>
+    <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="/static/src/osmrepohandler/osmrepos_list.js"></script>
+
+     <script>
+        var table;
+        $(document).ready( function () {
+            table = $('#osmr_table').DataTable({
+                responsive: true,
+                "ajax": {
+                    "url": "/osmrepo/list",
+                    "dataSrc": function (json) {
+                        return json['osmr'];
+                    },
+                    statusCode: {
+                        401: function () {
+                            console.log("no auth");
+                            moveToLogin(window.location.pathname);
+                        }
+                    },
+                    "error": function (hxr, error, thrown) {
+                        console.log(hxr)
+                        console.log(thrown)
+                        console.log(error);
+                    }
+
+                },
+                "columns": [
+                    {
+                        "render": function (data, type, row) {
+                            return row["name"];
+                        },
+                        "targets": 0
+                    },
+                    {
+                        "render": function (data, type, row) {
+                            return row['_id'];
+                        },
+                        "targets": 1
+                    },
+                    {
+                        "render": function (data, type, row) {
+                            return row["url"];
+                        },
+                        "targets": 2
+                    },
+                    {
+                        "render": function (data, type, row) {
+                            return row["type"];
+                        },
+                        "targets": 3
+                    },
+                    {
+                        "render": function (data, type, row) {
+                            return moment.unix(row['_admin']['created']).format('YYYY-MM-DD hh:mm:ss a');
+                        },
+                        "targets": 4
+                    },
+                    {
+                        "render": function (data, type, row) {
+                            return moment.unix(row['_admin']['modified']).format('YYYY-MM-DD hh:mm:ss a');
+                        },
+                        "targets": 5
+                    },
+                    {
+                        "render": function (data, type, row) {
+                            return '<div class="btn-group">' +
+                            '<button type="button" class="btn btn-default"' +
+                            'onclick="javascript:deleteOSMr(\''+row['_id']+'\', \''+ row["name"] +'\')" data-toggle="tooltip" data-placement="top" data-container="body" title="Delete">' +
+                            '<i class="far fa-trash-alt" ></i></button></div>';
+                        },
+                        "targets": 6,
+                        "orderable": false
+                    }
+                ]
+            });
+
+            setInterval(function () {
+                    table.ajax.reload();
+                }, 10000);
+        });
+
+    </script>
+{% endblock %}
+
+{% block footer %}
+    {% include "footer.html"  %}
+{% endblock %}
\ No newline at end of file
diff --git a/osmrepohandler/urls.py b/osmrepohandler/urls.py
new file mode 100644 (file)
index 0000000..64e9d3e
--- /dev/null
@@ -0,0 +1,26 @@
+#
+#   Copyright 2019 EveryUP Srl
+#
+#   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  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.
+#
+
+from django.conf.urls import url
+from osmrepohandler import views
+
+urlpatterns = [
+    url(r'^list$', views.list, name='list'),
+    url(r'^create/', views.create, name='create'),
+    url(r'^(?P<osmr_id>[0-9a-z-]+)/delete$', views.delete, name='delete'),
+    url(r'^(?P<osmr_id>[0-9a-z-]+)', views.show, name='show'),
+    url(r'^(?P<osmr_id>[0-9a-z-]+)/update$', views.update, name='update'),
+]
\ No newline at end of file
diff --git a/osmrepohandler/views.py b/osmrepohandler/views.py
new file mode 100644 (file)
index 0000000..2b9299c
--- /dev/null
@@ -0,0 +1,107 @@
+#
+#   Copyright 2020 ATOS
+#
+#   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  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.
+#
+
+from django.shortcuts import render, redirect
+from sf_t3d.decorators import login_required
+from django.http import HttpResponse
+import json
+import logging
+import authosm.utils as osmutils
+from lib.osm.osmclient.clientv2 import Client
+
+logging.basicConfig(level=logging.DEBUG)
+log = logging.getLogger('osmrepohandler/view.py')
+
+
+@login_required
+def list(request):
+    user = osmutils.get_user(request)
+    project_id = user.project_id
+    result = {'project_id': project_id}
+    raw_content_types = request.META.get('HTTP_ACCEPT', '*/*').split(',')
+    if 'application/json' not in raw_content_types:
+        return __response_handler(request, result, 'osmrepo_list.html')
+    client = Client()
+    result_client = client.osmr_list(user.get_token())
+
+    result['osmr'] = result_client['data'] if result_client and result_client['error'] is False else []
+
+    return __response_handler(request, result, 'osmrepo_list.html')
+
+
+@login_required
+def create(request):
+    user = osmutils.get_user(request)
+    project_id = user.project_id
+    result = {'project_id': project_id}
+    client = Client()
+    try:
+        new_osmr = {
+            "name": request.POST.get('name'),
+            "type": request.POST.get('type'),
+            "url": request.POST.get('url'),
+            "description": request.POST.get('description'),
+        }
+    except Exception as e:
+        return __response_handler(request, {'status': 400, 'code': 'BAD_REQUEST', 'detail': e.message}, url=None, status=400)
+    result = client.osmr_create(user.get_token(), new_osmr)
+    if result['error']:
+        return __response_handler(request, result['data'], url=None, status=result['data']['status'] if 'status' in result['data'] else 500)
+    else:
+        return __response_handler(request, result, 'osmr:list', to_redirect=True)
+
+
+@login_required
+def update(request, osmr_id=None):
+    user = osmutils.get_user(request)
+    try:
+        update_osmr_dict = request.POST.dict()
+        client = Client()
+        res = client.osmr_update(user.get_token(), osmr_id, update_osmr_dict)
+    except Exception as e:
+        log.exception(e)
+    return __response_handler(request, res, 'osmr:list', to_redirect=True)
+
+
+@login_required
+def show(request, osmr_id=None):
+    user = osmutils.get_user(request)
+    project_id = user.project_id
+    client = Client()
+    result_client = client.osmr_get(user.get_token(), osmr_id)
+
+    return __response_handler(request, result_client)
+
+
+@login_required
+def delete(request, osmr_id=None):
+    user = osmutils.get_user(request)
+    try:
+        client = Client()
+        del_res = client.osmr_delete(user.get_token(), osmr_id)
+    except Exception as e:
+        log.exception(e)
+    return __response_handler(request, del_res, 'osmr:list', to_redirect=True)
+
+
+def __response_handler(request, data_res, url=None, to_redirect=None, *args, **kwargs):
+    raw_content_types = request.META.get('HTTP_ACCEPT', '*/*').split(',')
+    if 'application/json' in raw_content_types or url is None:
+        return HttpResponse(json.dumps(data_res), content_type="application/json", *args, **kwargs)
+    elif to_redirect:
+        return redirect(url, *args, **kwargs)
+    else:
+        return render(request, url, data_res)
index 5fdaf57..8955c13 100644 (file)
@@ -137,7 +137,12 @@ limitations under the License.
                         </li>
                 </ul>
             </li>
-
+            {% url "osm:list"   as  osmrepo_list_url %}
+            <li {% if request.get_full_path == osmrepo_list_url %} class="active" {% endif %} >
+                <a href='{% url "osmr:list"   %}'>
+                    <i class="fa fa-folder fa-fw"></i><span>OSM Repositories</span>
+                </a>
+            </li>
             {% url "wims:list"   as  wim_list_url %}
             <li {% if request.get_full_path == wim_list_url %} class="active" {% endif %}>
                 <a href='{% url "wims:list"   %}'>
@@ -164,9 +169,8 @@ limitations under the License.
                     <i class="fas fa-user-tag"></i> <span>Roles</span>
                 </a>
                 </li>
-                
             {% endif %}
         </ul>
     </section>
     <!-- /.sidebar -->
-</aside>
\ No newline at end of file
+</aside>
index 528929d..560d05f 100644 (file)
@@ -66,7 +66,8 @@ INSTALLED_APPS = [
     'rolehandler',
     'netslicehandler',
     'k8sclusterhandler',
-    'k8srepohandler'
+    'k8srepohandler',
+    'osmrepohandler'
 
 ]
 
@@ -109,6 +110,7 @@ TEMPLATES = [
             os.path.join(BASE_DIR, 'netslicehandler', 'template'),
             os.path.join(BASE_DIR, 'k8sclusterhandler', 'template'),
             os.path.join(BASE_DIR, 'k8srepohandler', 'template'),
+            os.path.join(BASE_DIR, 'osmrepohandler', 'template'),
         ],
         'APP_DIRS': True,
         'OPTIONS': {
index a908c13..96d6060 100644 (file)
@@ -28,6 +28,7 @@ urlpatterns = [
     url(r'^vims/', include('vimhandler.urls', namespace='vims'), name='vims_base'),
     url(r'^k8scluster/', include('k8sclusterhandler.urls', namespace='k8sc'), name='k8sc_base'),
     url(r'^k8srepo/', include('k8srepohandler.urls', namespace='k8sr'), name='k8sr_base'),
+    url(r'^osmrepo/', include('osmrepohandler.urls', namespace='osmr'), name='osmr_base'),
     url(r'^wims/', include('wimhandler.urls', namespace='wims'), name='wims_base'),
     url(r'^packages/', include('packagehandler.urls', namespace='packages'), name='packages_base'),
     url(r'^instances/', include('instancehandler.urls', namespace='instances'), name='instances_base'),
diff --git a/static/src/osmrepohandler/osmrepos_list.js b/static/src/osmrepohandler/osmrepos_list.js
new file mode 100644 (file)
index 0000000..ba32654
--- /dev/null
@@ -0,0 +1,146 @@
+/*
+   Copyright 2019 EveryUP srl
+
+   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  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.
+*/
+
+function openModalRegisterOSMr(args) {
+    $('#modal_new_osmr').modal('show');
+}
+
+function showOSMr(osmr_id, osmr_name) {
+    var url_info = '/osmrepo/' + osmr_id;
+    var dialog = bootbox.dialog({
+        message: '<div class="text-center"><i class="fa fa-spin fa-spinner"></i> Loading...</div>',
+        closeButton: true
+    });
+    $.ajax({
+        url: url_info,
+        type: 'GET',
+        dataType: "json",
+        contentType: "application/json;charset=utf-8",
+        success: function (result) {
+
+            if (result['data'] !== undefined) {
+                editorJSON.setValue(JSON.stringify(result['data'], null, "\t"));
+                editorJSON.setOption("autoRefresh", true);
+                dialog.modal('hide');
+                $('#modal_show_osmr').modal('show');
+            }
+            else {
+                dialog.modal('hide');
+                bootbox.alert("An error occurred while retrieving the information.");
+            }
+        },
+        error: function (result) {
+            dialog.modal('hide');
+            bootbox.alert("An error occurred while retrieving the information.");
+        }
+    });
+}
+
+function deleteOSMr(osmr_id, osmr_name) {
+    var url = "/osmrepo/"+osmr_id+"/delete";
+    bootbox.confirm("Are you sure want to delete " + osmr_name + "?", function (result) {
+        if (result) {
+            var dialog = bootbox.dialog({
+                message: '<div class="text-center"><i class="fa fa-spin fa-spinner"></i> Loading...</div>',
+                closeButton: true
+            });
+            $.ajax({
+                url: url,
+                type: 'GET',
+                dataType: "json",
+                contentType: "application/json;charset=utf-8",
+                success: function (result) {
+                    if (result['error'] == true) {
+                        dialog.modal('hide');
+                        bootbox.alert("An error occurred.");
+                    }
+                    else {
+                        table.ajax.reload();
+                        dialog.modal('hide');
+                    }
+                },
+                error: function (error) {
+                    dialog.modal('hide');
+                    bootbox.alert("An error occurred.");
+                }
+            });
+        }
+    })
+}
+
+
+var editorJSON;
+
+$(document).ready(function () {
+
+    var json_editor_settings = {
+        mode: "javascript",
+        showCursorWhenSelecting: true,
+        autofocus: true,
+        lineNumbers: true,
+        lineWrapping: true,
+        foldGutter: true,
+        gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
+        autoCloseBrackets: true,
+        matchBrackets: true,
+        extraKeys: {
+            "F11": function (cm) {
+                cm.setOption("fullScreen", !cm.getOption("fullScreen"));
+            },
+            "Esc": function (cm) {
+                if (cm.getOption("fullScreen")) cm.setOption("fullScreen", false);
+            },
+            "Ctrl-Q": function (cm) {
+                cm.foldCode(cm.getCursor());
+            }
+        },
+        theme: "neat",
+        keyMap: "sublime"
+    };
+    var myJsonTextArea = document.getElementById("osmr_view_json");
+    editorJSON = CodeMirror(function (elt) {
+        myJsonTextArea.parentNode.replaceChild(elt, myJsonTextArea);
+    }, json_editor_settings);
+
+    $("#formCreateosmr").submit(function (event) {
+        event.preventDefault(); //prevent default action
+        var post_url = $(this).attr("action"); //get form action url
+        var request_method = $(this).attr("method"); //get form GET/POST method
+        var form_data = new FormData(this); //Encode form elements for submission
+        $.ajax({
+            url: post_url,
+            type: request_method,
+            data: form_data,
+            headers: {
+                "Accept": 'application/json'
+            },
+            contentType: false,
+            processData: false
+        }).done(function (response, textStatus, jqXHR) {
+            table.ajax.reload();
+            $('#modal_new_osmr').modal('hide');
+        }).fail(function (result) {
+            var data = result.responseJSON;
+            var title = "Error " + (data.code ? data.code : 'unknown');
+            var message = data.detail ? data.detail : 'No detail available.';
+            bootbox.alert({
+                title: title,
+                message: message
+            });
+        });
+    });
+
+});