Procházet zdrojové kódy

changed vygui to vycenter, changed device to instance

Roberto Berto před 5 roky
rodič
revize
ec839229e2
47 změnil soubory, kde provedl 76 přidání a 105 odebrání
  1. 3 0
      .gitignore
  2. binární
      vycenter/.DS_Store
  3. 0 0
      vycenter/.vyos.py.swp
  4. 0 0
      vycenter/auth/__init__.py
  5. 0 0
      vycenter/auth/admin.py
  6. 0 0
      vycenter/auth/apps.py
  7. 0 0
      vycenter/auth/migrations/__init__.py
  8. 0 0
      vycenter/auth/models.py
  9. 0 0
      vycenter/auth/tests.py
  10. 0 0
      vycenter/auth/views.py
  11. 0 0
      vycenter/config/__init__.py
  12. 0 0
      vycenter/config/admin.py
  13. 0 0
      vycenter/config/apps.py
  14. 0 0
      vycenter/config/migrations/__init__.py
  15. 0 0
      vycenter/config/models.py
  16. 6 0
      vycenter/config/templates/config/instance.html
  17. 5 0
      vycenter/config/templates/config/instance_add.html
  18. 0 0
      vycenter/config/tests.py
  19. 10 0
      vycenter/config/urls.py
  20. 40 0
      vycenter/config/views.py
  21. 0 0
      vycenter/dashboard/__init__.py
  22. 0 0
      vycenter/dashboard/admin.py
  23. 0 0
      vycenter/dashboard/apps.py
  24. 0 0
      vycenter/dashboard/migrations/__init__.py
  25. 0 0
      vycenter/dashboard/models.py
  26. 0 0
      vycenter/dashboard/tests.py
  27. 0 0
      vycenter/dashboard/urls.py
  28. 0 0
      vycenter/dashboard/views.py
  29. 1 1
      vycenter/manage.py
  30. 0 0
      vycenter/vycenter/__init__.py
  31. 2 2
      vycenter/vycenter/asgi.py
  32. 5 4
      vycenter/vycenter/settings.py
  33. 2 2
      vycenter/vycenter/urls.py
  34. 2 2
      vycenter/vycenter/wsgi.py
  35. 0 0
      vycenter/vyos.py
  36. 0 7
      vygui/dashboard/urls.py
  37. 0 7
      vygui/dashboard/views.py
  38. 0 3
      vygui/device/admin.py
  39. 0 5
      vygui/device/apps.py
  40. 0 0
      vygui/device/migrations/__init__.py
  41. 0 3
      vygui/device/models.py
  42. 0 17
      vygui/device/templates/device/index.html
  43. 0 17
      vygui/device/templates/device/interface.html
  44. 0 3
      vygui/device/tests.py
  45. 0 8
      vygui/device/urls.py
  46. 0 24
      vygui/device/views.py
  47. 0 0
      vygui/vygui/__init__.py

+ 3 - 0
.gitignore

@@ -127,3 +127,6 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+# Macos
+.DS_Store/

binární
vycenter/.DS_Store


+ 0 - 0
vygui/.vyos.py.swp → vycenter/.vyos.py.swp


+ 0 - 0
vygui/auth/__init__.py → vycenter/auth/__init__.py


+ 0 - 0
vygui/auth/admin.py → vycenter/auth/admin.py


+ 0 - 0
vygui/auth/apps.py → vycenter/auth/apps.py


+ 0 - 0
vygui/auth/migrations/__init__.py → vycenter/auth/migrations/__init__.py


+ 0 - 0
vygui/auth/models.py → vycenter/auth/models.py


+ 0 - 0
vygui/auth/tests.py → vycenter/auth/tests.py


+ 0 - 0
vygui/auth/views.py → vycenter/auth/views.py


+ 0 - 0
vygui/config/__init__.py → vycenter/config/__init__.py


+ 0 - 0
vygui/config/admin.py → vycenter/config/admin.py


+ 0 - 0
vygui/config/apps.py → vycenter/config/apps.py


+ 0 - 0
vygui/config/migrations/__init__.py → vycenter/config/migrations/__init__.py


+ 0 - 0
vygui/config/models.py → vycenter/config/models.py


+ 6 - 0
vycenter/config/templates/config/instance.html

@@ -0,0 +1,6 @@
+<h2>List of instances</h2>
+<p>List of instances, group owners</p>
+
+{% url 'instance-add' as instance_add %}
+<p><a href="{{ instance_add }}">Add a new instance</a></p>
+

+ 5 - 0
vycenter/config/templates/config/instance_add.html

@@ -0,0 +1,5 @@
+<h2>Instance add</h2>
+<p>List of instances, group owners</p>
+
+{% url 'instance-add' as instance_add %}
+<p>Add a new instance</p>

+ 0 - 0
vygui/config/tests.py → vycenter/config/tests.py


+ 10 - 0
vycenter/config/urls.py

@@ -0,0 +1,10 @@
+from django.urls import path
+
+from . import views
+
+urlpatterns = [
+    path('', views.index, name='index'),
+    path('instance_add/', views.instance_add, name='instance_add'),
+    path('instance/', views.instance, name='instance'),
+
+]

+ 40 - 0
vycenter/config/views.py

@@ -0,0 +1,40 @@
+from django.shortcuts import render
+from django.http import HttpResponse
+from django.template import loader
+
+import vyos
+
+
+def index(request):
+    #interfaces = vyos.get_interfaces()
+    
+    template = loader.get_template('config/instance.html')
+    context = { 
+        #'interfaces': interfaces,
+    }   
+    return HttpResponse(template.render(context, request))
+
+
+
+def instance(request):
+    #interfaces = vyos.get_interfaces()
+    
+    template = loader.get_template('config/instance.html')
+    context = { 
+        #'interfaces': interfaces,
+    }   
+    return HttpResponse(template.render(context, request))
+
+def instance_add(request):
+    #interfaces = vyos.get_interfaces()
+    
+    template = loader.get_template('config/instance_add.html')
+    context = { 
+        #'interfaces': interfaces,
+    }   
+    return HttpResponse(template.render(context, request))
+
+
+
+
+

+ 0 - 0
vygui/dashboard/__init__.py → vycenter/dashboard/__init__.py


+ 0 - 0
vygui/dashboard/admin.py → vycenter/dashboard/admin.py


+ 0 - 0
vygui/dashboard/apps.py → vycenter/dashboard/apps.py


+ 0 - 0
vygui/dashboard/migrations/__init__.py → vycenter/dashboard/migrations/__init__.py


+ 0 - 0
vygui/dashboard/models.py → vycenter/dashboard/models.py


+ 0 - 0
vygui/dashboard/tests.py → vycenter/dashboard/tests.py


+ 0 - 0
vygui/config/urls.py → vycenter/dashboard/urls.py


+ 0 - 0
vygui/config/views.py → vycenter/dashboard/views.py


+ 1 - 1
vygui/manage.py → vycenter/manage.py

@@ -5,7 +5,7 @@ import sys
 
 
 def main():
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'vygui.settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'vycenter.settings')
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

+ 0 - 0
vygui/device/__init__.py → vycenter/vycenter/__init__.py


+ 2 - 2
vygui/vygui/asgi.py → vycenter/vycenter/asgi.py

@@ -1,5 +1,5 @@
 """
-ASGI config for vygui project.
+ASGI config for vycenter project.
 
 It exposes the ASGI callable as a module-level variable named ``application``.
 
@@ -11,6 +11,6 @@ import os
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'vygui.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'vycenter.settings')
 
 application = get_asgi_application()

+ 5 - 4
vygui/vygui/settings.py → vycenter/vycenter/settings.py

@@ -1,5 +1,5 @@
 """
-Django settings for vygui project.
+Django settings for vycenter project.
 
 Generated by 'django-admin startproject' using Django 3.0.5.
 
@@ -37,7 +37,8 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'device.apps.DeviceConfig',
+    'instance.apps.InstanceConfig',
+    'config.apps.ConfigConfig',
 ]
 
 MIDDLEWARE = [
@@ -50,7 +51,7 @@ MIDDLEWARE = [
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-ROOT_URLCONF = 'vygui.urls'
+ROOT_URLCONF = 'vycenter.urls'
 
 TEMPLATES = [
     {
@@ -68,7 +69,7 @@ TEMPLATES = [
     },
 ]
 
-WSGI_APPLICATION = 'vygui.wsgi.application'
+WSGI_APPLICATION = 'vycenter.wsgi.application'
 
 
 # Database

+ 2 - 2
vygui/vygui/urls.py → vycenter/vycenter/urls.py

@@ -1,4 +1,4 @@
-"""vygui URL Configuration
+"""vycenter URL Configuration
 
 The `urlpatterns` list routes URLs to views. For more information please see:
     https://docs.djangoproject.com/en/3.0/topics/http/urls/
@@ -18,7 +18,7 @@ from django.urls import include, path
 
 
 urlpatterns = [
-    path('device/', include('device.urls')),
+    path('instance/', include('instance.urls')),
     path('config/', include('config.urls')),
     path('dashboard/', include('dashboard.urls')),
     path('admin/', admin.site.urls),

+ 2 - 2
vygui/vygui/wsgi.py → vycenter/vycenter/wsgi.py

@@ -1,5 +1,5 @@
 """
-WSGI config for vygui project.
+WSGI config for vycenter project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'vygui.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'vycenter.settings')
 
 application = get_wsgi_application()

+ 0 - 0
vygui/vyos.py → vycenter/vyos.py


+ 0 - 7
vygui/dashboard/urls.py

@@ -1,7 +0,0 @@
-from django.urls import path
-
-from . import views
-
-urlpatterns = [
-    path('', views.index, name='index'),
-]

+ 0 - 7
vygui/dashboard/views.py

@@ -1,7 +0,0 @@
-from django.shortcuts import render
-
-from django.http import HttpResponse
-
-
-def index(request):
-    return HttpResponse("Hello, world. You're at the polls index.")

+ 0 - 3
vygui/device/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

+ 0 - 5
vygui/device/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class DeviceConfig(AppConfig):
-    name = 'device'

+ 0 - 0
vygui/device/migrations/__init__.py


+ 0 - 3
vygui/device/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

+ 0 - 17
vygui/device/templates/device/index.html

@@ -1,17 +0,0 @@
-{% if interfaces %}
-    <table border="1" width="100%">
-    <tr><th>type</th><th>name</th><th>address</th></tr>
-
-    {% for key, value in interfaces.items %}
-        <tr><td>{{ key }}</td>
-        {% for ifkey, ifvalue in value.items %}
-            <td>{% url 'device-views-interface' key ifkey as url_interface %}
-            <a href="{{ url_interface }}">{{ ifkey }}</a></td><td>{{ ifvalue.address }}</td>
-        {% endfor %}
-        </tr>
-    {% endfor %}
-
-    </table>
-{% else %}
-    <p>No interfaces.</p>
-{% endif %}

+ 0 - 17
vygui/device/templates/device/interface.html

@@ -1,17 +0,0 @@
-{% if interface %}
-<h2>Interface</h2>
-
-{{ interface }}
-    <table border="1" width="100%">
-    <tr>
-    <th>address</th> <td>{{ interface.address }}</td>
-    </tr>
-
-    <tr>
-    <th>mtu</th> <td>{{ interface.mtu }}</td>
-    </tr>
-
-    </table>
-{% else %}
-    <p>Invalid interface.</p>
-{% endif %}

+ 0 - 3
vygui/device/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

+ 0 - 8
vygui/device/urls.py

@@ -1,8 +0,0 @@
-from django.urls import path
-
-from . import views
-
-urlpatterns = [
-    path('', views.index, name='index'),
-    path('interface/<slug:interface_type>/<slug:interface_name>', views.interface, name='device-views-interface'),
-]

+ 0 - 24
vygui/device/views.py

@@ -1,24 +0,0 @@
-from django.shortcuts import render
-from django.http import HttpResponse
-from django.template import loader
-
-import vyos
-
-def index(request):
-    interfaces = vyos.get_interfaces()
-    
-    template = loader.get_template('device/index.html')
-    context = {
-        'interfaces': interfaces,
-    }
-    return HttpResponse(template.render(context, request))
-
-def interface(request, interface_type, interface_name):
-    interface = vyos.get_interface(interface_type, interface_name)
-    
-    template = loader.get_template('device/interface.html')
-    context = { 
-        'interface': interface,
-    }   
-    return HttpResponse(template.render(context, request))
-

+ 0 - 0
vygui/vygui/__init__.py