cp_oraclecloud 0.1.11 → 0.1.12

data/app/views/cp_oraclecloud/java_components/_fields.html.erb

@@ -1,10 +1,12 @@
-<em>Required fields are on the General and Database tabs. You can ignore the rest if needed</em>
+<div class="bd-callout bd-callout-danger">
+	<p>Required fields are on the General and Database tabs. You can ignore the rest if needed</p>
+</div>
 <ul class="nav nav-tabs">
-  <li role="presentation" class="active"><a href="#general" data-toggle="tab">* General</a></li>
-  <li role="presentation"><a href="#database" data-toggle="tab"> * Database</a></li>
-  <li role="presentation"><a href="#storage" data-toggle="tab"> Storage</a></li>
-  <li role="presentation"><a href="#networking" data-toggle="tab"> Networking</a></li>
-  <li role="presentation"><a href="#config" data-toggle="tab">Server Config</a></li>
+  <li role="presentation" class="nav-item"><a href="#general" class="nav-link" data-toggle="tab">* General</a></li>
+  <li role="presentation" class="nav-item"><a href="#database" class="nav-link" data-toggle="tab"> * Database</a></li>
+  <li role="presentation" class="nav-item"><a href="#storage" class="nav-link" data-toggle="tab"> Storage</a></li>
+  <li role="presentation" class="nav-item"><a href="#networking" class="nav-link" data-toggle="tab"> Networking</a></li>
+  <li role="presentation" class="nav-item"><a href="#config" class="nav-link" data-toggle="tab">Server Config</a></li>
 </ul>
 
 

data/app/views/cp_oraclecloud/java_instances/_show.html.erb

@@ -1,37 +1,85 @@
-<dl class="dl-horizontal">
-	<% ['description', 'status', 'shape', 'level', 'edition', 'version', 'service_uri'].each { |a| %>
-		<% if instance.attr_get(a).present? then %>
-			<dt><%= a.titleize() %></dt>
-			<dd><%= instance.attr_get(a) %></dd>
-		<% end %>
- 	<% } %>
-</dl>
-
-<ul class="nav nav-tabs">
-  <li role="presentation" class="active"><a href="#servers" data-toggle="tab">Servers</a></li>
-</ul>
+	</div>
+</div>
+<div class="row">
+	<div class="col-md-8">
+		<div class="row">
+			<div class="col-xs-6 col-lg-4">
+				<div class="card">
+					<div class="card-block p-a-0 clearfix">
+						<i class="fa fa-dollar bg-primary p-a-2 font-2xl m-r-1 pull-left"></i>
+						<div class="h5 text-primary m-b-0 p-t-1"><%= number_to_currency(instance.month_cost) %></div>
+							<div class="text-muted text-uppercase font-weight-bold font-xs">Cost Per Month</div>
+					</div>
+				</div>
+			</div>
+			<div class="col-xs-6 col-lg-4">
+				<div class="card">
+					<div class="card-block p-a-0 clearfix">
+						<i class="fa fa-heartbeat bg-<%= instance.attr_get('status') == 'Running' ? 'success' : 'danger' %> p-a-2 font-2xl m-r-1 pull-left"></i>
+						<div class="h5 text-<%= instance.attr_get('status') == 'Running' ? 'success' : 'danger' %> m-b-0 p-t-1"><%= instance.attr_get('status') %></div>
+							<div class="text-muted text-uppercase font-weight-bold font-xs">Status</div>
+					</div>
+				</div>
+			</div>
+			<div class="col-xs-6 col-lg-4">
+				<div class="card">
+					<div class="card-block p-a-0 clearfix">
+						<i class="fa fa-list-alt bg-info p-a-2 font-2xl m-r-1 pull-left"></i>
+						<div class="h5 text-info m-b-0 p-t-1"><%= instance.attr_get('shape').upcase %> - <%= instance.attr_get('edition') %></div>
+							<div class="text-muted text-uppercase font-weight-bold font-xs">Type</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-xs-12">
+				<div class="card">
+				  <div class="card-block">
+				    <div class="row">
+					    <ul class="nav nav-tabs">
+							  <li role="presentation" class="nav-item active"><a href="#servers" data-toggle="tab" class="nav-link">Servers</a></li>
+							</ul>
+							<div class="tab-content ">
+							  <div class="tab-pane active" id="servers">
+							   	<table class="table table-striped table-hover">
+									 	<thead>
+									    <tr>
+									      <th>Hostname</th>
+									      <th>Status</th>
+									      <th>Shape</th>
+									      <th></th>
+									    </tr>
+									  </thead>
+									  <tbody>
+									    <% instance.fog.servers.each {|i| %>
+									    	<tr>
+									    		<td><%= i.hostname %></td>
+									    		<td><%= i.status %></td>
+									    		<td><%= i.shape %></td>
+									    		<td></td>
+									    	</tr>
+									    <% } %>
+									  </tbody>
+									</table>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="col-md-4">
+		<div class="card">
+			<div class="card-header">Actions</div>
+			<div class="card-block">
+				<button type="button" class="btn btn-outline-primary btn-lg btn-block">Go to Console</button>
+				<button type="button" class="btn btn-outline-primary btn-lg btn-block">Scale Up</button>
+				<button type="button" class="btn btn-outline-primary btn-lg btn-block">Scale Out</button>
+				<button type="button" class="btn btn-outline-primary btn-lg btn-block">Backup</button>
+				<button type="button" class="btn btn-outline-primary btn-lg btn-block">Restore</button>
 
-<div class="tab-content ">
-  <div class="tab-pane active" id="servers">
-   	<table class="table table-striped table-hover">
-		 	<thead>
-		    <tr>
-		      <th>Hostname</th>
-		      <th>Status</th>
-		      <th>Shape</th>
-		      <th></th>
-		    </tr>
-		  </thead>
-		  <tbody>
-		    <% instance.fog.servers.each {|i| %>
-		    	<tr>
-		    		<td><%= i.hostname %></td>
-		    		<td><%= i.status %></td>
-		    		<td><%= i.shape %></td>
-		    		<td></td>
-		    	</tr>
-		    <% } %>
-		  </tbody>
-		</table>
+			</div>
+		</div>
 	</div>
 </div>

data/app/views/cp_oraclecloud/ssh_keys/_form.html.erb

@@ -1,7 +1,7 @@
 <%= simple_form_for(ssh_key) do |f| %>
 
 	<%= f.input :name %>
-	<%= f.input :enabled, as: :boolean %>
+	<%= f.input :enabled, as: :boolean, checked_value: "true", unchecked_value: "false"%>
 	<%= f.input :key, as: :text %>
 	
 	<%= f.button :submit, class: "btn-primary" %>

data/app/views/cp_oraclecloud/ssh_keys/edit.html.erb

@@ -1,4 +1,19 @@
-<header>
-	<h1>Edit SSH Key</h1>
-</header>
-<%= render "form", ssh_key: @ssh_key %>
+<ol class="breadcrumb">
+  <li class="breadcrumb-item"><%= link_to "Home", root_path %></li>
+  <li class="breadcrumb-item"><%= link_to "Oracle Cloud", cp_oraclecloud_admin_path %></li>
+  <li class="breadcrumb-item active">Edit SSH Key</li>
+
+</ol>
+<div class="card">
+	<div class="card-header">
+    <i class="fa fa-edit"></i>Edit SSH Key
+    <div class="card-actions">
+		  <%= link_to cp_oraclecloud_admin_path do %>
+      	<i class="fa fa-close"></i>
+      <% end %>
+    </div>
+  </div>   	
+  <div class="card-block">
+		<%= render "form", ssh_key: @ssh_key %>
+	</div>
+</div>

data/app/views/cp_oraclecloud/ssh_keys/new.html.erb

@@ -1,4 +1,19 @@
-<header>
-	<h1>Create SSH Key</h1>
-</header>
-<%= render "form", ssh_key: @ssh_key %>
+<ol class="breadcrumb">
+  <li class="breadcrumb-item"><%= link_to "Home", root_path %></li>
+  <li class="breadcrumb-item"><%= link_to "Oracle Cloud", cp_oraclecloud_admin_path %></li>
+  <li class="breadcrumb-item active">New</li>
+
+</ol>
+<div class="card">
+	<div class="card-header">
+    <i class="fa fa-edit"></i>New SSH Key
+    <div class="card-actions">
+		  <%= link_to cp_oraclecloud_admin_path do %>
+      	<i class="fa fa-close"></i>
+      <% end %>
+    </div>
+  </div>   	
+  <div class="card-block">
+		<%= render "form", ssh_key: @ssh_key %>
+	</div>
+</div>

data/app/views/products/_cp_oraclecloud_component_menu.html.erb

@@ -1,16 +1,28 @@
-<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Oracle Cloud Platform<span class="caret"></span>
+<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Oracle Cloud Platform<span class="caret"></span>
 </button>
 <ul class="dropdown-menu">
 	<% CpOraclecloud.active_components.each do | comp | %>
-		<li>
+		<li class="dropdown-item">
 		<% if comp == 'Database' %>
-			<%= link_to "Create Database", [@product, CpOraclecloud::DatabaseComponent, action: :new]%>
+			<%= link_to [@product, CpOraclecloud::DatabaseComponent, action: :new], {title: "Create Oracle Database Cloud Service"} do %>
+				<i class="fa fa-database"></i>
+				Database
+			<% end %>
 		<% elsif comp == 'Java' %>
-			<%= link_to "Create WebLogic", [@product, CpOraclecloud::JavaComponent, action: :new]%>
+			<%= link_to [@product, CpOraclecloud::JavaComponent, action: :new] do %>
+				<i class="fa fae-java"></i>
+				WebLogic
+			<% end %>
 		<% elsif comp == 'SOA' %>
-			<%= link_to "Create SOA Instance", [@product, CpOraclecloud::SoaComponent, action: :new]%>
+			<%= link_to [@product, CpOraclecloud::SoaComponent, action: :new] do %>
+				<i class="fa fa-code-fork"></i>
+				SOA Suite
+			<% end %>
 		<% elsif comp == 'Compute' %>
-			<%= link_to "Create Compute Instance", [@product, CpOraclecloud::ComputeComponent, action: :new] %>
+			<%= link_to [@product, CpOraclecloud::ComputeComponent, action: :new] do %>
+				<i class="fa fa-desktop"></i>
+				Compute Instance
+			<% end %>
 		<% end %>
 		</li>
 	<% end %>

data/config/initializers/fog.rb

@@ -0,0 +1,3 @@
+if Rails.env.development? then
+	Fog.mock!
+end

data/config/routes.rb

@@ -18,5 +18,7 @@ Rails.application.routes.draw do
 		resources :soa_instances, type: 'CpOraclecloud::SoaInstance'
 		resources :compute_instances, type: 'CpOraclecloud::SoaInstance'
 		resources	:ssh_keys
+		resources :images
+		get 'admin' => 'admin#dashboard'
 	end
 end

data/lib/cp_oraclecloud.rb

@@ -20,5 +20,9 @@ module CpOraclecloud
 	def self.setup
     yield self
   end
+
+  def self.to_s
+    "Oracle Cloud"
+  end 
 end
 	

data/lib/cp_oraclecloud/compute_mixin.rb

@@ -1,6 +1,7 @@
 module CpOraclecloud
 	module ComputeMixin
-		def calculate_monthly_cost(config)
+		def calculate_monthly_cost(override=nil)
+			if override.nil? then override = config end
 			CpOraclecloud.rate_card[:compute]['hourly'] * 24 * 30		
 		end
 	end

data/lib/cp_oraclecloud/database_mixin.rb

@@ -1,15 +1,16 @@
 module CpOraclecloud
 	module DatabaseMixin
-		def calculate_monthly_cost(config)
+		def calculate_monthly_cost(override=nil)
+			if override.nil? then override = config end
 			cost = 0
-			if %w(oc3 oc4 oc5 oc6).include? config['shape'] 
+			if %w(oc3 oc4 oc5 oc6).include? override['shape'] 
 	    	# General Compute
 	    	rates = CpOraclecloud.rate_card[:database]['general']
 	    else 
 	    	# High Memory
 	    	rates = CpOraclecloud.rate_card[:database]['high']
 	    end
-	    case config['edition']
+	    case override['edition']
 	    when 'SE'
 	    	edition_rate = rates['standard']
 	    when 'EE'
@@ -19,7 +20,7 @@ module CpOraclecloud
 	    when 'EE_XP'
 	    	edition_rate = rates['xp']
 	    end
-				if config['subscription_type'] == 'MONTHLY' then cost = edition_rate['monthly']
+				if override['subscription_type'] == 'MONTHLY' then cost = edition_rate['monthly']
 	    else cost = 30 * 24 * edition_rate['hourly'] end
 	    cost
 		end

data/lib/cp_oraclecloud/engine.rb

@@ -1,8 +1,7 @@
+require 'fog/oraclecloud'
+
 module CpOraclecloud
   class Engine < ::Rails::Engine
 
-  	def self.setup
-	    yield self
-	  end
   end
 end

data/lib/cp_oraclecloud/java_mixin.rb

@@ -1,14 +1,15 @@
 module CpOraclecloud
 	module JavaMixin
-		def calculate_monthly_cost(config)
-			if %w(oc3 oc4 oc5 oc6).include? config['shape'] 
+		def calculate_monthly_cost(override=nil)
+			if override.nil? then override = config end
+			if %w(oc3 oc4 oc5 oc6).include? override['shape'] 
 	    	# General Compute
 	    	rates = CpOraclecloud.rate_card[:java]['general']
 	    else 
 	    	# High Memory
 	    	rates = CpOraclecloud.rate_card[:java]['high']
 	    end
-	    case config['edition']
+	    case override['edition']
 	    when 'SE'
 	    	edition_rate = rates['standard']
 	    when 'EE'
@@ -16,9 +17,9 @@ module CpOraclecloud
 	    when 'Suite'
 	    	edition_rate = rates['suite']
 	    end
-	    if config['subscription_type'] == 'MONTHLY' then cost = edition_rate['monthly']
+	    if override['subscription_type'] == 'MONTHLY' then cost = edition_rate['monthly']
 	    else cost = 30 * 24 * edition_rate['hourly'] end
-	    cost = cost * config['num_nodes'].to_f
+	    cost = cost * override['num_nodes'].to_f
 	    cost
 		end
 	end

data/lib/cp_oraclecloud/soa_mixin.rb

@@ -1,9 +1,10 @@
 module CpOraclecloud
 	module SoaMixin
-		def calculate_monthly_cost(config)
+		def calculate_monthly_cost(override=nil)
+			if override.nil? then override = config end
 			cost = 0
-			if config['topology'] == 'mft' then cost = CpOraclecloud.rate_card[:soa]['mft']
-			elsif config['topology'] == 'apim' then cost = CpOraclecloud.rate_card[:soa]['api']
+			if override['topology'] == 'mft' then cost = CpOraclecloud.rate_card[:soa]['mft']
+			elsif override['topology'] == 'apim' then cost = CpOraclecloud.rate_card[:soa]['api']
 			else cost = CpOraclecloud.rate_card[:soa]['full'] end
 	    cost
 		end

data/lib/cp_oraclecloud/version.rb

@@ -1,3 +1,3 @@
 module CpOraclecloud
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

metadata

@@ -1,47 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: cp_oraclecloud
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Joel Nation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0.1
+- !ruby/object:Gem::Dependency
+  name: fog-oraclecloud
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Plugin for Cloud_Portal to add support for the Oracle Cloud Platform
@@ -51,20 +65,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/assets/config/cp_oraclecloud_manifest.js
+- app/assets/javascripts/cp_oraclecloud/admin.js
+- app/assets/stylesheets/cp_oraclecloud/admin.css
+- app/controllers/cp_oraclecloud/admin_controller.rb
 - app/controllers/cp_oraclecloud/compute_components_controller.rb
 - app/controllers/cp_oraclecloud/compute_instances_controller.rb
 - app/controllers/cp_oraclecloud/database_components_controller.rb
 - app/controllers/cp_oraclecloud/database_instances_controller.rb
+- app/controllers/cp_oraclecloud/images_controller.rb
 - app/controllers/cp_oraclecloud/java_components_controller.rb
 - app/controllers/cp_oraclecloud/java_instances_controller.rb
 - app/controllers/cp_oraclecloud/soa_components_controller.rb
 - app/controllers/cp_oraclecloud/soa_instances_controller.rb
 - app/controllers/cp_oraclecloud/ssh_keys_controller.rb
+- app/helpers/cp_oraclecloud/admin_helper.rb
 - app/models/cp_oraclecloud/compute_component.rb
 - app/models/cp_oraclecloud/compute_instance.rb
 - app/models/cp_oraclecloud/database_component.rb
 - app/models/cp_oraclecloud/database_instance.rb
+- app/models/cp_oraclecloud/image.rb
 - app/models/cp_oraclecloud/java_component.rb
 - app/models/cp_oraclecloud/java_instance.rb
 - app/models/cp_oraclecloud/soa_component.rb
@@ -74,11 +97,13 @@ files:
 - app/policies/cp_oraclecloud/compute_instance_policy.rb
 - app/policies/cp_oraclecloud/database_component_policy.rb
 - app/policies/cp_oraclecloud/database_instance_policy.rb
+- app/policies/cp_oraclecloud/image_policy.rb
 - app/policies/cp_oraclecloud/java_component_policy.rb
 - app/policies/cp_oraclecloud/java_instance_policy.rb
 - app/policies/cp_oraclecloud/soa_component_policy.rb
 - app/policies/cp_oraclecloud/soa_instance_policy.rb
 - app/policies/cp_oraclecloud/ssh_key_policy.rb
+- app/views/cp_oraclecloud/admin/dashboard.html.erb
 - app/views/cp_oraclecloud/compute_components/_fields.html.erb
 - app/views/cp_oraclecloud/compute_instances/_show.html.erb
 - app/views/cp_oraclecloud/database_components/_fields.html.erb
@@ -92,18 +117,16 @@ files:
 - app/views/cp_oraclecloud/ssh_keys/index.html.erb
 - app/views/cp_oraclecloud/ssh_keys/new.html.erb
 - app/views/products/_cp_oraclecloud_component_menu.html.erb
+- config/initializers/fog.rb
 - config/routes.rb
+- lib/cp_oraclecloud.rb
 - lib/cp_oraclecloud/compute_mixin.rb
 - lib/cp_oraclecloud/database_mixin.rb
 - lib/cp_oraclecloud/engine.rb
 - lib/cp_oraclecloud/java_mixin.rb
 - lib/cp_oraclecloud/soa_mixin.rb
 - lib/cp_oraclecloud/version.rb
-- lib/cp_oraclecloud.rb
 - lib/tasks/cp_oraclecloud_tasks.rake
-- MIT-LICENSE
-- Rakefile
-- README.md
 homepage: http://github.com/Joelith
 licenses:
 - MIT
@@ -114,17 +137,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Plugin for Cloud_Portal to add support for the Oracle Cloud Platform