cp_oraclecloud 0.1.9 → 0.1.10

data/app/models/cp_oraclecloud/java_instance.rb

@@ -1,56 +1,56 @@
-module CpOraclecloud
-  class JavaInstance < CloudInstance
-    include CpOraclecloud::JavaMixin
-
-		def provision
-			connection.instances.create(init_config)
-		end
-
-		def wait
-			fog.wait_for { ready? }
-		end
-
-		def provider
-			"OracleCloud"
-		end
-
-		def cloud_type
-			"Java"
-		end
-
-		def fog
-			@instance ||= connection.instances.get(name)
-			@instance
-		end
-
-		def attr_get(attribute)
-			begin
-				@instance ||= connection.instances.get(name)
-				@instance.attributes[attribute.to_sym]
-			rescue Fog::OracleCloud::Database::NotFound
-				"Error"
-			end
-		end
-
-		def month_cost
-			cost = calculate_monthly_cost(init_config)
-			cost
-		end
-
-		def calc_cost(start_date, end_date)
-			cost = 0
-			cost = (end_date - start_date) * (month_cost / 30)
-			cost
-		end
-
-		def connection 
-	 		@connection ||= Fog::OracleCloud::Java.new(
-	      :oracle_username => CpOraclecloud.username,
-	      :oracle_password => CpOraclecloud.password,
-	      :oracle_domain => CpOraclecloud.domain,
-	      :oracle_region => CpOraclecloud.region
-	      )
-		end
-
-	end
+module CpOraclecloud
+  class JavaInstance < CloudInstance
+    include CpOraclecloud::JavaMixin
+
+		def provision
+			connection.instances.create(init_config)
+		end
+
+		def wait
+			fog.wait_for { ready? }
+		end
+
+		def provider
+			"OracleCloud"
+		end
+
+		def cloud_type
+			"Java"
+		end
+
+		def fog
+			@instance ||= connection.instances.get(name)
+			@instance
+		end
+
+		def attr_get(attribute)
+			begin
+				@instance ||= connection.instances.get(name)
+				@instance.attributes[attribute.to_sym]
+			rescue Fog::OracleCloud::Database::NotFound
+				"Error"
+			end
+		end
+
+		def month_cost
+			cost = calculate_monthly_cost(init_config)
+			cost
+		end
+
+		def calc_cost(start_date, end_date)
+			cost = 0
+			cost = (end_date - start_date) * (month_cost / 30)
+			cost
+		end
+
+		def connection 
+	 		@connection ||= Fog::OracleCloud::Java.new(
+	      :oracle_username => CpOraclecloud.username,
+	      :oracle_password => CpOraclecloud.password,
+	      :oracle_domain => CpOraclecloud.domain,
+	      :oracle_region => CpOraclecloud.region
+	      )
+		end
+
+	end
 end

data/app/models/cp_oraclecloud/soa_component.rb

@@ -1,59 +1,59 @@
-module CpOraclecloud
-  class SoaComponent < CloudComponent
-    include CpOraclecloud::SoaMixin
-
-    after_initialize :init
-    store :config, accessors: [:service_name, :cloud_storage_container, :cloud_storage_pwd, :cloud_storage_user, :description, :provision_otd, :subscription_type, :level, :topology, :admin_password, :admin_username, :dba_name, :dba_password, :db_service_name, :num_nodes, :shape, :ssh_key, :version], coder: JSON
-
-    enum shape: [:oc1m, :oc2m, :oc3m, :oc4m, :oc5m]
-    enum topology: [:soa, :osb, :soaosb, :b2b, :mft, :apim, :insight]
-  
-    validates :service_name, :presence => true
-    validates :shape, :presence => true
-    validates :version, :presence => true
-    validates :ssh_key, :presence => true
-    validates :admin_password, :presence => true
-    validates :admin_username, :presence => true
-    validates :topology, :presence => true
-
-    validate :admin_password_complexity
-    validate :server_count_correct
-
-    def init
-      self.provision_otd ||= false
-      self.level ||= 'PAAS'
-      self.subscription_type ||= 'MONTHLY'
-      self.num_nodes ||= 1
-    end
-
-    def server_count_correct
-      if ![1,2,4].include?(num_nodes.to_i) then errors.add :num_nodes, "Invalid server count" end
-    end
-
-    def admin_password_complexity
-      if admin_password.size < 8 or admin_password.size > 30
-        errors.add :admin_password, "Must be at betweeen 8 and 30 characters long."
-      end
-      if !(admin_password[0] =~ /[[:alpha:]]/)
-        errors.add :admin_password, "First character must be a letter"
-      end
-      if (admin_password =~ /[a-z]/).blank? then errors.add :admin_password, 'Must contain a lower case letter' end
-      if (admin_password =~ /[A-Z]/).blank? then errors.add :admin_password, 'Must contain an upper case letter' end
-      if (admin_password =~ /[0-9]/).blank? then errors.add :admin_password, 'Must contain atleast one number' end
-      if (admin_password =~ /[-_#$]/).blank? then errors.add :admin_password, 'Must contain a special character (-, _, #, $)' end
-
-    end
-
-    def pretty_type
-      'Oracle SOA Cloud Service'
-    end
-
-    def instance_name
-      "service_name"
-    end
-
-    def instance_type
-      "CpOraclecloud::SoaInstance"
-    end
-  end
+module CpOraclecloud
+  class SoaComponent < CloudComponent
+    include CpOraclecloud::SoaMixin
+
+    after_initialize :init
+    store :config, accessors: [:service_name, :cloud_storage_container, :cloud_storage_pwd, :cloud_storage_user, :description, :provision_otd, :subscription_type, :level, :topology, :admin_password, :admin_username, :dba_name, :dba_password, :db_service_name, :num_nodes, :shape, :ssh_key, :version], coder: JSON
+
+    enum shape: [:oc1m, :oc2m, :oc3m, :oc4m, :oc5m]
+    enum topology: [:soa, :osb, :soaosb, :b2b, :mft, :apim, :insight]
+  
+    validates :service_name, :presence => true
+    validates :shape, :presence => true
+    validates :version, :presence => true
+    validates :ssh_key, :presence => true
+    validates :admin_password, :presence => true
+    validates :admin_username, :presence => true
+    validates :topology, :presence => true
+
+    validate :admin_password_complexity
+    validate :server_count_correct
+
+    def init
+      self.provision_otd ||= false
+      self.level ||= 'PAAS'
+      self.subscription_type ||= 'MONTHLY'
+      self.num_nodes ||= 1
+    end
+
+    def server_count_correct
+      if ![1,2,4].include?(num_nodes.to_i) then errors.add :num_nodes, "Invalid server count" end
+    end
+
+    def admin_password_complexity
+      if admin_password.size < 8 or admin_password.size > 30
+        errors.add :admin_password, "Must be at betweeen 8 and 30 characters long."
+      end
+      if !(admin_password[0] =~ /[[:alpha:]]/)
+        errors.add :admin_password, "First character must be a letter"
+      end
+      if (admin_password =~ /[a-z]/).blank? then errors.add :admin_password, 'Must contain a lower case letter' end
+      if (admin_password =~ /[A-Z]/).blank? then errors.add :admin_password, 'Must contain an upper case letter' end
+      if (admin_password =~ /[0-9]/).blank? then errors.add :admin_password, 'Must contain atleast one number' end
+      if (admin_password =~ /[-_#$]/).blank? then errors.add :admin_password, 'Must contain a special character (-, _, #, $)' end
+
+    end
+
+    def pretty_type
+      'Oracle SOA Cloud Service'
+    end
+
+    def instance_name
+      "service_name"
+    end
+
+    def instance_type
+      "CpOraclecloud::SoaInstance"
+    end
+  end
 end

data/app/models/cp_oraclecloud/soa_instance.rb

@@ -1,56 +1,56 @@
-module CpOraclecloud
-  class SoaInstance < CloudInstance
-    include CpOraclecloud::SoaMixin
-
-		def provision
-			connection.instances.create(init_config)
-		end
-
-		def wait
-			fog.wait_for { ready? }
-		end
-
-		def provider
-			"OracleCloud"
-		end
-
-		def cloud_type
-			"SOA"
-		end
-
-		def fog
-			@instance ||= connection.instances.get(name)
-			@instance
-		end
-
-		def attr_get(attribute)
-			begin
-				@instance ||= connection.instances.get(name)
-				@instance.attributes[attribute.to_sym]
-			rescue Fog::OracleCloud::Database::NotFound
-				"Error"
-			end
-		end
-
-		def month_cost
-			cost = calculate_monthly_cost(init_config)
-			cost
-		end
-
-		def calc_cost(start_date, end_date)
-			cost = 0
-			cost = (end_date - start_date) * (month_cost / 30)
-			cost
-		end
-
-		def connection 
-	 		@connection ||= Fog::OracleCloud::SOA.new(
-	      :oracle_username => CpOraclecloud.username,
-	      :oracle_password => CpOraclecloud.password,
-	      :oracle_domain => CpOraclecloud.domain,
-	      :oracle_region => CpOraclecloud.region
-	      )
-		end
-
-	end
+module CpOraclecloud
+  class SoaInstance < CloudInstance
+    include CpOraclecloud::SoaMixin
+
+		def provision
+			connection.instances.create(init_config)
+		end
+
+		def wait
+			fog.wait_for { ready? }
+		end
+
+		def provider
+			"OracleCloud"
+		end
+
+		def cloud_type
+			"SOA"
+		end
+
+		def fog
+			@instance ||= connection.instances.get(name)
+			@instance
+		end
+
+		def attr_get(attribute)
+			begin
+				@instance ||= connection.instances.get(name)
+				@instance.attributes[attribute.to_sym]
+			rescue Fog::OracleCloud::Database::NotFound
+				"Error"
+			end
+		end
+
+		def month_cost
+			cost = calculate_monthly_cost(init_config)
+			cost
+		end
+
+		def calc_cost(start_date, end_date)
+			cost = 0
+			cost = (end_date - start_date) * (month_cost / 30)
+			cost
+		end
+
+		def connection 
+	 		@connection ||= Fog::OracleCloud::SOA.new(
+	      :oracle_username => CpOraclecloud.username,
+	      :oracle_password => CpOraclecloud.password,
+	      :oracle_domain => CpOraclecloud.domain,
+	      :oracle_region => CpOraclecloud.region
+	      )
+		end
+
+	end
 end

data/app/models/cp_oraclecloud/ssh_key.rb

@@ -1,62 +1,62 @@
-module CpOraclecloud
-  class SshKey
-    include ActiveModel::Validations
-    include ActiveModel::Conversion
-    extend ActiveModel::Naming
-
-    attr_accessor :uri, :enabled, :key, :name
-
-    validates :enabled, inclusion: [true, false]
-    validates :key, :presence => true
-    validates :name, :presence => true
-
-
-    def initialize(attributes = {})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end
-    end
-
-    def to_model
-      self
-    end
-
-    def persisted?
-      false
-    end
-
-    def self.all
-      connection.ssh_keys
-    end
-
-    def self.find_by_id(id)
-      connection.ssh_keys.get(id)
-    end
-
-    def self.create(params)
-      connection.ssh_keys.create(:name => params[:name],
-                             :enabled => params[:enabled],
-                             :key => params[:key])
-    end
-
-    def save
-      self.connection.ssh_keys.create(:name => name,
-                                 :enabled => enabled,
-                                 :key => key)
-    end
-
-    def self.delete(id)
-      connection.ssh_keys.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
+module CpOraclecloud
+  class SshKey
+    include ActiveModel::Validations
+    include ActiveModel::Conversion
+    extend ActiveModel::Naming
+
+    attr_accessor :uri, :enabled, :key, :name
+
+    validates :enabled, inclusion: [true, false]
+    validates :key, :presence => true
+    validates :name, :presence => true
+
+
+    def initialize(attributes = {})
+      attributes.each do |name, value|
+        send("#{name}=", value)
+      end
+    end
+
+    def to_model
+      self
+    end
+
+    def persisted?
+      false
+    end
+
+    def self.all
+      connection.ssh_keys
+    end
+
+    def self.find_by_id(id)
+      connection.ssh_keys.get(id)
+    end
+
+    def self.create(params)
+      connection.ssh_keys.create(:name => params[:name],
+                             :enabled => params[:enabled],
+                             :key => params[:key])
+    end
+
+    def save
+      self.connection.ssh_keys.create(:name => name,
+                                 :enabled => enabled,
+                                 :key => key)
+    end
+
+    def self.delete(id)
+      connection.ssh_keys.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