From 3f3c8355981fb98ce753c207d45d80cc38949276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Floure?=
Date: Mon, 12 Apr 2021 15:53:49 +0200
Subject: [PATCH] VirtualMachineHosting* -> VirtualMachine*
---
...ne_hosting_controller.ex => virtual_machine_controller.ex} | 2 +-
lib/meta_web/router.ex | 4 ++--
lib/meta_web/templates/layout/_sidebar_nav.html.eex | 2 +-
.../index.html.eex | 2 +-
.../show.html.eex | 0
...irtual_machine_hosting_view.ex => virtual_machine_view.ex} | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
rename lib/meta_web/controllers/{virtual_machine_hosting_controller.ex => virtual_machine_controller.ex} (97%)
rename lib/meta_web/templates/{virtual_machine_hosting => virtual_machine}/index.html.eex (95%)
rename lib/meta_web/templates/{virtual_machine_hosting => virtual_machine}/show.html.eex (100%)
rename lib/meta_web/views/{virtual_machine_hosting_view.ex => virtual_machine_view.ex} (87%)
diff --git a/lib/meta_web/controllers/virtual_machine_hosting_controller.ex b/lib/meta_web/controllers/virtual_machine_controller.ex
similarity index 97%
rename from lib/meta_web/controllers/virtual_machine_hosting_controller.ex
rename to lib/meta_web/controllers/virtual_machine_controller.ex
index 8560bc5..2065337 100644
--- a/lib/meta_web/controllers/virtual_machine_hosting_controller.ex
+++ b/lib/meta_web/controllers/virtual_machine_controller.ex
@@ -1,4 +1,4 @@
-defmodule MetaWeb.VirtualMachineHostingController do
+defmodule MetaWeb.VirtualMachineController do
use MetaWeb, :controller
alias Meta.OpenNebula, as: ONE
diff --git a/lib/meta_web/router.ex b/lib/meta_web/router.ex
index 4a48249..232adbd 100644
--- a/lib/meta_web/router.ex
+++ b/lib/meta_web/router.ex
@@ -75,8 +75,8 @@ defmodule MetaWeb.Router do
get "/billing", BillingController, :index
post "/billing/partner/update", BillingController, :update
- get "/hosting/vm", VirtualMachineHostingController, :index
- get "/hosting/vm/:location/:id", VirtualMachineHostingController, :show
+ get "/hosting/vm", VirtualMachineController, :index
+ get "/hosting/vm/:location/:id", VirtualMachineController, :show
end
scope "/", MetaWeb do
diff --git a/lib/meta_web/templates/layout/_sidebar_nav.html.eex b/lib/meta_web/templates/layout/_sidebar_nav.html.eex
index d6ed1f5..0672e58 100644
--- a/lib/meta_web/templates/layout/_sidebar_nav.html.eex
+++ b/lib/meta_web/templates/layout/_sidebar_nav.html.eex
@@ -12,7 +12,7 @@
<%= link "Name Service", to: Routes.page_path(@conn, :index) %>
<%= link "Storage Services", to: Routes.page_path(@conn, :index) %>
-->
- <%= link "Virtual Machines", to: Routes.virtual_machine_hosting_path(@conn, :index) %>
+ <%= link "Virtual Machines", to: Routes.virtual_machine_path(@conn, :index) %>
<% else %>
<%= link "Log in", to: Routes.user_session_path(@conn, :new) %>
<%= link "Register", to: Routes.user_registration_path(@conn, :new) %>
diff --git a/lib/meta_web/templates/virtual_machine_hosting/index.html.eex b/lib/meta_web/templates/virtual_machine/index.html.eex
similarity index 95%
rename from lib/meta_web/templates/virtual_machine_hosting/index.html.eex
rename to lib/meta_web/templates/virtual_machine/index.html.eex
index c2c4dbf..03e3b5e 100644
--- a/lib/meta_web/templates/virtual_machine_hosting/index.html.eex
+++ b/lib/meta_web/templates/virtual_machine/index.html.eex
@@ -31,7 +31,7 @@ OpenNebula for every location you want to use.
<%= Map.get(vm, :NAME) %> |
<%= render_state(vm) %> |
- <%= link "Show history »", to: Routes.virtual_machine_hosting_path(@conn, :show, location, Map.get(vm, :ID)) %>
+ <%= link "Show history »", to: Routes.virtual_machine_path(@conn, :show, location, Map.get(vm, :ID)) %>
|
<% end %>
diff --git a/lib/meta_web/templates/virtual_machine_hosting/show.html.eex b/lib/meta_web/templates/virtual_machine/show.html.eex
similarity index 100%
rename from lib/meta_web/templates/virtual_machine_hosting/show.html.eex
rename to lib/meta_web/templates/virtual_machine/show.html.eex
diff --git a/lib/meta_web/views/virtual_machine_hosting_view.ex b/lib/meta_web/views/virtual_machine_view.ex
similarity index 87%
rename from lib/meta_web/views/virtual_machine_hosting_view.ex
rename to lib/meta_web/views/virtual_machine_view.ex
index ce27262..fcd07a7 100644
--- a/lib/meta_web/views/virtual_machine_hosting_view.ex
+++ b/lib/meta_web/views/virtual_machine_view.ex
@@ -1,4 +1,4 @@
-defmodule MetaWeb.VirtualMachineHostingView do
+defmodule MetaWeb.VirtualMachineView do
use MetaWeb, :view
alias Meta.OpenNebula, as: ONE