cp_oraclecloud 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45071c8290ac64652b2673b95d58f43f5e5ed372
-  data.tar.gz: 21a89e55d533e9431b20911afdb85e9b6da7ffc0
+  metadata.gz: 4190430a8ab637918083a4079c35da1260e250ec
+  data.tar.gz: 734aae870038e47627a5bc12a0535ff1fd7e90f2
 SHA512:
-  metadata.gz: ff8e4da6966f985abbbf49d27899acd25a2ead1162a275f85d4521f8dea3f1956715cb161aedd0519071c18d25fee50611645ea30a7b371f2734c24943ef8194
-  data.tar.gz: 54a16102e188637e42710463b44af6ed8fc8e2bc1f634e6566ba21b896b0cd7b15551d4eedaf540faaede6a267151369e392d01c27ec1f65fe7f33b2afc12c04
+  metadata.gz: c1fe6ef99a9fffcfb73b767c138dac24e44b07c4a48a4e119f73dbad6d5c07ce29531eef2b04095d9470ebb7c4497423606d5a66f7d3f83234af55f4470d641e
+  data.tar.gz: c8b843326660b1d6841f8d5df2e1a7369aeb47776642fda8b50a921cd3b8b4798ccc8b0c0c934b82f7684aab738bcfc850deda952fe3d8e8f60cffa01dc23cb8

data/app/assets/javascripts/cp_oraclecloud/admin.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/cp_oraclecloud/admin.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/controllers/cp_oraclecloud/admin_controller.rb

@@ -0,0 +1,31 @@
+class CpOraclecloud::AdminController < ApplicationController
+	def dashboard
+		@ssh_keys = policy_scope(CpOraclecloud::SshKey)
+		@images = policy_scope(CpOraclecloud::Image)
+		@instances = CloudInstance.eager_load(environment: :project).where("type LIKE :prefix", prefix: "CpOraclecloud%")
+	
+		@totals = {
+			:database => {:total => 0, :cost=>0},
+			:java => {:total => 0, :cost=>0},
+			:soa => {:total => 0, :cost=>0},
+			:compute => {:total => 0, :cost=>0}
+		}
+		@instances.each do |i|
+			key = nil
+			case i.type
+			when "CpOraclecloud::DatabaseInstance"
+				key = :database
+			when "CpOraclecloud::JavaInstance"
+				key = :java
+			when "CpOraclecloud::SoaInstance"
+				key = :soa
+			when "CpOraclecloud::ComputeInstance"
+				key = :compute
+			end
+			if key 
+				@totals[key.to_sym][:total] += 1	
+				@totals[key.to_sym][:cost] += i.calc_cost(i.environment.start_date, i.environment.end_date)
+			end
+		end
+	end
+end

data/app/controllers/cp_oraclecloud/images_controller.rb

@@ -0,0 +1,70 @@
+module CpOraclecloud
+	class ImagesController < ApplicationController
+		before_action :set_image, only: [:edit, :update, :destroy]
+
+		def index
+			authorize Image
+			@images = CpOraclecloud::Image.all
+		end
+
+		def new
+			authorize Image
+			@image = CpOraclecloud::Image.new
+		end
+
+		#def show
+		#	authorize @ssh_key
+		#end
+
+		def create
+			authorize Image
+		  @image = Image.new(image_params )
+
+		  if @image.valid?
+		  	image = Image.create(image_params )
+		    flash[:notice] = "Image has been created."
+		    redirect_to cp_oraclecloud_admin_path
+		  else
+	  	  flash.now[:alert] = "Image has not been created."
+		    render "new"
+		  end
+		end
+
+		def edit
+			#authorize @image
+		end
+
+		def destroy
+			authorize @image
+			#@image.destroy
+			Image.delete(@image.id)
+	  	flash[:notice] = "Image has been deleted."
+
+	  	redirect_to cp_oraclecloud_admin_path
+		end
+
+		def update
+			authorize @image
+			if @image.update(image_params)
+				flash[:notice] = "Image has been updated."
+				redirect_to cp_oraclecloud_admin_path
+			else
+				flash.now[:alert] = "Image has not been updated."
+				render "edit"
+			end
+		end
+
+		private
+
+		def set_image
+		  @image = CpOraclecloud::Image.find_by_id(params[:id])
+		rescue ActiveRecord::RecordNotFound
+		  flash[:alert] = "The Image you were looking for could not be found."
+		  redirect_to cp_oraclecloud_admin_path
+		end
+
+		def image_params
+	  	params.require(:cp_oraclecloud_image).permit(:name, :default, :description)
+		end
+	end
+end

data/app/controllers/cp_oraclecloud/ssh_keys_controller.rb

@@ -1,10 +1,10 @@
 module CpOraclecloud
 	class SshKeysController < ApplicationController
-		before_action :set_ssh_key, only: [:show, :edit, :update, :destroy]
+		before_action :set_ssh_key, only: [:edit, :update, :destroy]
 
 		def index
 			authorize SshKey
-			@ssh_keys = policy_scope(SshKey)
+			@ssh_keys = SshKey.all
 		end
 
 		def new
@@ -12,17 +12,18 @@ module CpOraclecloud
 			@ssh_key = CpOraclecloud::SshKey.new
 		end
 
-		def show
-			authorize @ssh_key
-		end
+		#def show
+		#	authorize @ssh_key
+		#end
 
 		def create
 			authorize SshKey
 		  @ssh_key = SshKey.new(ssh_key_params)
 
-		  if @ssh_key.save
+		  if @ssh_key.valid?
+		  	ssh_key = SshKey.create(ssh_key_params)
 		    flash[:notice] = "SSH Key has been created."
-		    redirect_to cp_oraclecloud_ssh_keys_path
+		    redirect_to cp_oraclecloud_admin_path
 		  else
 	  	  flash.now[:alert] = "SSH Key has not been created."
 		    render "new"
@@ -30,22 +31,23 @@ module CpOraclecloud
 		end
 
 		def edit
-			authorize @ssh_key
+			#authorize @ssh_key
 		end
 
 		def destroy
 			authorize @ssh_key
-			@ssh_key.destroy
+			#@ssh_key.destroy
+			SshKey.delete(@ssh_key.id)
 	  	flash[:notice] = "SSH Key has been deleted."
 
-	  	redirect_to cp_oraclecloud_ssh_keys_path
+	  	redirect_to cp_oraclecloud_admin_path
 		end
 
 		def update
 			authorize @ssh_key
-			if @ssh_key.update_attributes(ssh_key_params)
+			if @ssh_key.update(ssh_key_params)
 				flash[:notice] = "SSH Key has been updated."
-				redirect_to cp_oraclecloud_ssh_keys_path
+				redirect_to cp_oraclecloud_admin_path
 			else
 				flash.now[:alert] = "SSH Key has not been updated."
 				render "edit"
@@ -55,10 +57,10 @@ module CpOraclecloud
 		private
 
 		def set_ssh_key
-		  @project = CpOraclecloud::SshKey.find(params[:name])
+		  @ssh_key = CpOraclecloud::SshKey.find_by_id(params[:id])
 		rescue ActiveRecord::RecordNotFound
 		  flash[:alert] = "The SSH Key you were looking for could not be found."
-		  redirect_to cp_oraclecloud_ssh_keys_path
+		  redirect_to cp_oraclecloud_admin_path
 		end
 
 		def ssh_key_params

data/app/helpers/cp_oraclecloud/admin_helper.rb

@@ -0,0 +1,2 @@
+module CpOraclecloud::AdminHelper
+end

data/app/models/cp_oraclecloud/compute_instance.rb

@@ -2,7 +2,7 @@ module CpOraclecloud
   class ComputeInstance < CloudInstance
     include CpOraclecloud::ComputeMixin
 
-		def provision
+		def _provision
 			connection.instances.create(init_config)
 		end
 
@@ -18,6 +18,10 @@ module CpOraclecloud
 			"Compute"
 		end
 
+		def icon
+			"fa-desktop"
+		end
+
 		def fog
 			@instance ||= connection.instances.get(name)
 			@instance

data/app/models/cp_oraclecloud/database_component.rb

@@ -21,7 +21,7 @@ module CpOraclecloud
     validates :backup_destination, :presence => true
 
     def pretty_type
-      'Oracle Database CS'
+      'Oracle Database Cloud Service'
     end
 
     def pretty_size

data/app/models/cp_oraclecloud/database_instance.rb

@@ -2,10 +2,14 @@ module CpOraclecloud
   class DatabaseInstance < CloudInstance
   	include CpOraclecloud::DatabaseMixin
 
-		def provision
+		def _provision
 			@instance = connection.instances.create(init_config)
 		end
 
+		def _deprovision
+			fog.destroy()
+		end
+
 		def wait
 			fog.wait_for { ready? }
 		end
@@ -18,9 +22,17 @@ module CpOraclecloud
 			"Database"
 		end
 
+		def icon
+			"fa-database"
+		end
+
 		def fog
-			@instance ||= connection.instances.get(name)
-			@instance
+			begin
+				@instance ||= connection.instances.get(name)
+				@instance
+			rescue Fog::OracleCloud::Database::NotFound
+				nil
+			end
 		end
 
 		def attr_get(attribute)

data/app/models/cp_oraclecloud/image.rb

@@ -0,0 +1,77 @@
+module CpOraclecloud
+  class Image
+    include ActiveModel::Validations
+    include ActiveModel::Conversion
+    extend ActiveModel::Naming
+
+    attr_accessor :id, :uri, :name, :default, :description, :entries
+
+    validates :name, :presence => true
+
+    def initialize(attributes = {})
+      if !attributes[:name].blank?
+        regex = attributes[:name].match(/\/.*\/(.*)/)
+        if regex && regex.length > 1
+          clean_name = regex[1]
+          attributes[:id] = clean_name
+          attributes[:name] = clean_name
+        end
+      end
+      attributes.each do |field, value|
+        send("#{field}=", value)
+      end
+    end
+
+    def to_s
+      name
+    end
+
+    def to_model
+      self
+    end
+
+    def persisted?
+      !id.blank?
+    end
+
+    def self.all
+      result = []
+      connection.image_lists.each { |k| result.push(CpOraclecloud::Image.new(k.attributes))}
+      result
+    end
+
+    def self.find_by_id(id)
+      data = connection.image_lists.get(id)
+      CpOraclecloud::Image.new(data.attributes)
+    end
+
+    def self.create(params)
+      connection.image_lists.create(:name => params[:name],
+                                 :default => params[:default],
+                                 :description => params[:description])
+    end
+
+    def update(params)
+      fog = self.class.connection.image_lists.get(id)
+
+      [:name, :default, :description].each do |field|
+        fog.attributes[field.to_sym] = params[field.to_sym]
+      end
+      fog.update
+    end
+
+    def self.delete(id)
+      connection.image_lists.get(id).destroy
+    end
+
+    def self.connection
+      @connection ||= Fog::Compute.new(
+        :provider => 'OracleCloud',
+        :oracle_username => CpOraclecloud.username,
+        :oracle_password => CpOraclecloud.password,
+        :oracle_domain => CpOraclecloud.domain,
+        :oracle_compute_api => CpOraclecloud.compute_api
+        )
+    end
+  end
+end

data/app/models/cp_oraclecloud/java_instance.rb

@@ -2,7 +2,7 @@ module CpOraclecloud
   class JavaInstance < CloudInstance
     include CpOraclecloud::JavaMixin
 
-		def provision
+		def _provision
 			connection.instances.create(init_config)
 		end
 
@@ -18,6 +18,10 @@ module CpOraclecloud
 			"Java"
 		end
 
+		def icon
+			"fae-java"
+		end
+
 		def fog
 			@instance ||= connection.instances.get(name)
 			@instance
@@ -25,9 +29,8 @@ module CpOraclecloud
 
 		def attr_get(attribute)
 			begin
-				@instance ||= connection.instances.get(name)
-				@instance.attributes[attribute.to_sym]
-			rescue Fog::OracleCloud::Database::NotFound
+				fog.attributes[attribute.to_sym]
+			rescue Fog::OracleCloud::Java::NotFound
 				"Error"
 			end
 		end

data/app/models/cp_oraclecloud/soa_instance.rb

@@ -2,7 +2,7 @@ module CpOraclecloud
   class SoaInstance < CloudInstance
     include CpOraclecloud::SoaMixin
 
-		def provision
+		def _provision
 			connection.instances.create(init_config)
 		end
 
@@ -18,6 +18,10 @@ module CpOraclecloud
 			"SOA"
 		end
 
+		def icon
+			"fa-code-fork"
+		end
+
 		def fog
 			@instance ||= connection.instances.get(name)
 			@instance

data/app/models/cp_oraclecloud/ssh_key.rb

@@ -4,45 +4,62 @@ module CpOraclecloud
     include ActiveModel::Conversion
     extend ActiveModel::Naming
 
-    attr_accessor :uri, :enabled, :key, :name
+    attr_accessor :id, :uri, :enabled, :key, :name
 
-    validates :enabled, inclusion: [true, false]
+    validates :enabled, inclusion: ["true", "false"]
     validates :key, :presence => true
     validates :name, :presence => true
 
-
     def initialize(attributes = {})
-      attributes.each do |name, value|
-        send("#{name}=", value)
+      if !attributes[:name].blank?
+        regex = attributes[:name].match(/\/.*\/(.*)/)
+        if regex && regex.length > 1
+          clean_name = regex[1]
+          attributes[:id] = clean_name
+          attributes[:name] = clean_name
+        end
+      end
+      attributes.each do |field, value|
+        send("#{field}=", value)
       end
     end
 
+    def to_s
+      name
+    end
+
     def to_model
       self
     end
 
     def persisted?
-      false
+      !id.blank?
     end
 
     def self.all
-      connection.ssh_keys
+      result = []
+      connection.ssh_keys.each { |k| result.push(CpOraclecloud::SshKey.new(k.attributes))}
+      result
     end
 
     def self.find_by_id(id)
-      connection.ssh_keys.get(id)
+      data = connection.ssh_keys.get(id)
+      CpOraclecloud::SshKey.new(data.attributes)
     end
 
     def self.create(params)
       connection.ssh_keys.create(:name => params[:name],
-                             :enabled => params[:enabled],
-                             :key => params[:key])
+                                 :enabled => params[:enabled],
+                                 :key => params[:key])
     end
 
-    def save
-      self.connection.ssh_keys.create(:name => name,
-                                 :enabled => enabled,
-                                 :key => key)
+    def update(params)
+      fog_key = self.class.connection.ssh_keys.get(id)
+
+      [:name, :enabled, :key].each do |field|
+        fog_key.attributes[field.to_sym] = params[field.to_sym]
+      end
+      fog_key.update
     end
 
     def self.delete(id)