cp_oraclecloud 0.1.9 → 0.1.10

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

@@ -1,37 +1,37 @@
-<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 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>
+<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 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>

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

@@ -1,37 +1,37 @@
-<em>Required fields are on the General tab. You can ignore the rest if needed</em>
-<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>
-</ul>
-
-
-<div class="tab-content ">
-  <div class="tab-pane active" id="general">
-		<%= f.input :service_name %>
-		<%= f.input :description %>
-		<%= f.input :topology %>
-		<%= f.input :shape %>
-		<%= f.input :num_nodes, label: 'Managed Server Count', as: :integer, hint: 'Valid values: 1, 2, 4, 8' %>
-		<%= f.input :version %>
-		<%= f.input :ssh_key %>
-		<%= f.input :admin_username %>
-		<%= f.input :admin_password, input_html: { value: @component.admin_password } %>
-	</div>
-	<div class="tab-pane" id="storage">
-		<em>If you leave these blank, the system will create a storage container with the name '%service_name%_backup'</em>
-		<%= f.input :cloud_storage_container %>
-		<%= f.input :cloud_storage_user %>
-		<%= f.input :cloud_storage_pwd, input_html: { value: @component.cloud_storage_pwd }%>
-	</div>
-	<div class="tab-pane" id="database">
-		<em>If you leave these blank, the system will create a Enterprise Edition (12.1.0.2) Database of size 'oc3' with the name '%service_name%-DB'</em>
-		<%= f.input :db_service_name %>
-		<%= f.input :dba_name %>
-		<%= f.input :dba_password, input_html: { value: @component.dba_password }%>		
-	</div>
-	<div class="tab-pane" id="networking">
-		<%= f.input :provision_otd, as: :boolean %>
-	</div>
+<em>Required fields are on the General tab. You can ignore the rest if needed</em>
+<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>
+</ul>
+
+
+<div class="tab-content ">
+  <div class="tab-pane active" id="general">
+		<%= f.input :service_name %>
+		<%= f.input :description %>
+		<%= f.input :topology %>
+		<%= f.input :shape %>
+		<%= f.input :num_nodes, label: 'Managed Server Count', as: :integer, hint: 'Valid values: 1, 2, 4, 8' %>
+		<%= f.input :version %>
+		<%= f.input :ssh_key %>
+		<%= f.input :admin_username %>
+		<%= f.input :admin_password, input_html: { value: @component.admin_password } %>
+	</div>
+	<div class="tab-pane" id="storage">
+		<em>If you leave these blank, the system will create a storage container with the name '%service_name%_backup'</em>
+		<%= f.input :cloud_storage_container %>
+		<%= f.input :cloud_storage_user %>
+		<%= f.input :cloud_storage_pwd, input_html: { value: @component.cloud_storage_pwd }%>
+	</div>
+	<div class="tab-pane" id="database">
+		<em>If you leave these blank, the system will create a Enterprise Edition (12.1.0.2) Database of size 'oc3' with the name '%service_name%-DB'</em>
+		<%= f.input :db_service_name %>
+		<%= f.input :dba_name %>
+		<%= f.input :dba_password, input_html: { value: @component.dba_password }%>		
+	</div>
+	<div class="tab-pane" id="networking">
+		<%= f.input :provision_otd, as: :boolean %>
+	</div>
 </div>

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

@@ -1,8 +1,8 @@
-<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>
+<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>

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

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

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

@@ -1,4 +1,4 @@
-<header>
-	<h1>Edit SSH Key</h1>
-</header>
+<header>
+	<h1>Edit SSH Key</h1>
+</header>
 <%= render "form", ssh_key: @ssh_key %>

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

@@ -1,34 +1,34 @@
-<header>
-  <h1>SSH Keys</h1>
-
-	  <ul class="actions">
-      <% if policy(CpOraclecloud::SshKey).new? %>
-	     <li><%= link_to "New SSH Key", new_cp_oraclecloud_ssh_key_path,
-	      class: "new" %></li>
-      <% end %>
-    </ul>
-    
-</header>
-
-<div id="ssh_keys">
-  <table class="table table-striped table-hover">
-    <thead>
-      <tr>
-        <th>Name</th>
-        <th>Enabled</th>
-        <th>Actions</th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @ssh_keys.each do |key| %>
-        <tr>
-          <td><%= key.name %></td>
-          <td><%= key.enabled %></td>
-          <td><%= link_to "", key, method: :delete,
-data: { confirm: "Are you sure you want to delete this SSH Key? This will remove it from the cloud."},
-class: "delete" %></td>
-        </tr>
-      <% end %>
-    </tbody>    
-  </table>
+<header>
+  <h1>SSH Keys</h1>
+
+	  <ul class="actions">
+      <% if policy(CpOraclecloud::SshKey).new? %>
+	     <li><%= link_to "New SSH Key", new_cp_oraclecloud_ssh_key_path,
+	      class: "new" %></li>
+      <% end %>
+    </ul>
+    
+</header>
+
+<div id="ssh_keys">
+  <table class="table table-striped table-hover">
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>Enabled</th>
+        <th>Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @ssh_keys.each do |key| %>
+        <tr>
+          <td><%= key.name %></td>
+          <td><%= key.enabled %></td>
+          <td><%= link_to "", key, method: :delete,
+data: { confirm: "Are you sure you want to delete this SSH Key? This will remove it from the cloud."},
+class: "delete" %></td>
+        </tr>
+      <% end %>
+    </tbody>    
+  </table>
 </div>

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

@@ -1,4 +1,4 @@
-<header>
-	<h1>Create SSH Key</h1>
-</header>
+<header>
+	<h1>Create SSH Key</h1>
+</header>
 <%= render "form", ssh_key: @ssh_key %>

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

@@ -1,17 +1,17 @@
-<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>
-<ul class="dropdown-menu">
-	<% CpOraclecloud.active_components.each do | comp | %>
-		<li>
-		<% if comp == 'Database' %>
-			<%= link_to "Create Database", [@product, CpOraclecloud::DatabaseComponent, action: :new]%>
-		<% elsif comp == 'Java' %>
-			<%= link_to "Create WebLogic", [@product, CpOraclecloud::JavaComponent, action: :new]%>
-		<% elsif comp == 'SOA' %>
-			<%= link_to "Create SOA Instance", [@product, CpOraclecloud::SoaComponent, action: :new]%>
-		<% elsif comp == 'Compute' %>
-			<%= link_to "Create Compute Instance", [@product, CpOraclecloud::ComputeComponent, action: :new] %>
-		<% end %>
-		</li>
-	<% end %>
-</ul>
+<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>
+<ul class="dropdown-menu">
+	<% CpOraclecloud.active_components.each do | comp | %>
+		<li>
+		<% if comp == 'Database' %>
+			<%= link_to "Create Database", [@product, CpOraclecloud::DatabaseComponent, action: :new]%>
+		<% elsif comp == 'Java' %>
+			<%= link_to "Create WebLogic", [@product, CpOraclecloud::JavaComponent, action: :new]%>
+		<% elsif comp == 'SOA' %>
+			<%= link_to "Create SOA Instance", [@product, CpOraclecloud::SoaComponent, action: :new]%>
+		<% elsif comp == 'Compute' %>
+			<%= link_to "Create Compute Instance", [@product, CpOraclecloud::ComputeComponent, action: :new] %>
+		<% end %>
+		</li>
+	<% end %>
+</ul>

data/config/routes.rb

@@ -1,22 +1,22 @@
-Rails.application.routes.draw do
-	resources :products do
-		namespace :cp_oraclecloud do
-			resources :database_components, type: 'CpOraclecloud::DatabaseComponent'
-			resources :java_components, type: 'CpOraclecloud::JavaComponent'
-			resources :soa_components, type: 'CpOraclecloud::SoaComponent'
-			resources :compute_components, type: 'CpOraclecloud::ComputeComponent'
-		end
-	end
-
-	namespace :cp_oraclecloud do
-		resources :database_instances, type: 'CpOraclecloud::DatabaseInstance' do
-			put :backup
-		end
-		resources :java_instances, type: 'CpOraclecloud::JavaInstance' do
-			put :backup
-		end
-		resources :soa_instances, type: 'CpOraclecloud::SoaInstance'
-		resources :compute_instances, type: 'CpOraclecloud::SoaInstance'
-		resources	:ssh_keys
-	end
-end
+Rails.application.routes.draw do
+	resources :products do
+		namespace :cp_oraclecloud do
+			resources :database_components, type: 'CpOraclecloud::DatabaseComponent'
+			resources :java_components, type: 'CpOraclecloud::JavaComponent'
+			resources :soa_components, type: 'CpOraclecloud::SoaComponent'
+			resources :compute_components, type: 'CpOraclecloud::ComputeComponent'
+		end
+	end
+
+	namespace :cp_oraclecloud do
+		resources :database_instances, type: 'CpOraclecloud::DatabaseInstance' do
+			put :backup
+		end
+		resources :java_instances, type: 'CpOraclecloud::JavaInstance' do
+			put :backup
+		end
+		resources :soa_instances, type: 'CpOraclecloud::SoaInstance'
+		resources :compute_instances, type: 'CpOraclecloud::SoaInstance'
+		resources	:ssh_keys
+	end
+end

data/lib/cp_oraclecloud.rb

@@ -1,24 +1,22 @@
-require "cp_oraclecloud/engine"
-
-module CpOraclecloud
-	  extend ActiveSupport::Autoload
-
-  mattr_accessor :username
-  mattr_accessor :password
-  mattr_accessor :domain
-  mattr_accessor :compute_api
-  mattr_accessor :storage_api
-  mattr_accessor :region
-  mattr_accessor :active_components
-  mattr_accessor :rate_card
-
-  autoload :DatabaseMixin
-  autoload :JavaMixin
-  autoload :SoaMixin
-  autoload :ComputeMixin
-
-	def self.setup
-    yield self
-  end
-end
+require "cp_oraclecloud/engine"
+
+module CpOraclecloud
+	extend ActiveSupport::Autoload
+
+  mattr_accessor :username
+  mattr_accessor :password
+  mattr_accessor :domain
+  mattr_accessor :compute_api
+  mattr_accessor :storage_api
+  mattr_accessor :region
+  mattr_accessor :active_components
+  mattr_accessor :rate_card
+
+  autoload :DatabaseMixin
+  autoload :JavaMixin
+  autoload :SoaMixin
+  autoload :ComputeMixin
+
+	
+end
 	

data/lib/cp_oraclecloud/compute_mixin.rb

@@ -1,7 +1,7 @@
-module CpOraclecloud
-	module ComputeMixin
-		def calculate_monthly_cost(config)
-			CpOraclecloud.rate_card[:compute]['hourly'] * 24 * 30		
-		end
-	end
-end
+module CpOraclecloud
+	module ComputeMixin
+		def calculate_monthly_cost(config)
+			CpOraclecloud.rate_card[:compute]['hourly'] * 24 * 30		
+		end
+	end
+end

data/lib/cp_oraclecloud/database_mixin.rb

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