fog-oraclecloud 0.1.12 → 0.1.13

data/lib/fog/oraclecloud/models/java/instances.rb

@@ -1,23 +1,23 @@
-require 'fog/core/collection'
-
-module Fog
-  module OracleCloud
-    class Java
-      class Instances < Fog::Collection
-
-      	model Fog::OracleCloud::Java::Instance
-
-      	def all
-          data = service.list_instances().body['services']
-          load(data)
-        end
-
-        def get(service_name)
-          new(service.get_instance(service_name).body)
-        end
-
-      end
-    end
-
-  end
-end
+require 'fog/core/collection'
+
+module Fog
+  module OracleCloud
+    class Java
+      class Instances < Fog::Collection
+
+      	model Fog::OracleCloud::Java::Instance
+
+      	def all
+          data = service.list_instances().body['services']
+          load(data)
+        end
+
+        def get(service_name)
+          new(service.get_instance(service_name).body)
+        end
+
+      end
+    end
+
+  end
+end

data/lib/fog/oraclecloud/models/java/server.rb

@@ -1,62 +1,62 @@
-require 'fog/compute/models/server'
-
-module Fog
-  module OracleCloud
-    class Java
-      class Server < Fog::Model
-      	identity :name
-
-      	attribute :cluster_name,     :aliases=>'clusterName'
-        attribute :job_id,           :aliases=>'jobId'
-      	attribute :name
-      	attribute :shape
-      	attribute :node_type,        :aliases=>'nodeType'
-      	attribute :is_admin,         :aliases=>'isAdmin'
-      	attribute :hostname
-      	attribute :status
-      	attribute :reserved_ip,      :aliases=>'reservedIp'
-        attribute :reserved_ipaddress,      :aliases=>'reservedIpAddress'
-        attribute :reserved_ipname,      :aliases=>'reservedIpName'
-      	attribute :storage_allocated, :aliases=>'storageAllocated'
-      	attribute :creation_date,     :aliases=>'creationDate'
-        attribute :service_name
-
-      	def ip_addr
-          reserved_ip.blank? ? hostname : reserved_ip
-        end
-
-        def ready?
-          status == "Ready"
-        end
-
-        def scale(shape)
-          if !%w(oc3 oc4 oc5 oc6 oc1m oc2m oc3m oc4m).include? shape then
-            raise ArgumentError, "Invalid Shape. Valid values - oc3, oc4, oc5, oc6, oc1m, oc2m, oc3m or oc4m"
-          end
-          service.scale_a_node(service_name, name, :shape=>shape)
-        end
-
-        def scale_in_a_cluster
-          requires :service_name, :identity
-          service.scale_in_a_cluster(service_name, identity)
-        end
-
-        def reload
-          requires :identity, :service_name
-
-          data = begin
-            collection.get(service_name, identity)
-          rescue Excon::Errors::SocketError
-            nil
-          end
-
-          return unless data
-
-          new_attributes = data.attributes
-          merge_attributes(new_attributes)
-          self
-        end
-      end
-    end
-  end
-end
+require 'fog/compute/models/server'
+
+module Fog
+  module OracleCloud
+    class Java
+      class Server < Fog::Model
+      	identity :name
+
+      	attribute :cluster_name,     :aliases=>'clusterName'
+        attribute :job_id,           :aliases=>'jobId'
+      	attribute :name
+      	attribute :shape
+      	attribute :node_type,        :aliases=>'nodeType'
+      	attribute :is_admin,         :aliases=>'isAdmin'
+      	attribute :hostname
+      	attribute :status
+      	attribute :reserved_ip,      :aliases=>'reservedIp'
+        attribute :reserved_ipaddress,      :aliases=>'reservedIpAddress'
+        attribute :reserved_ipname,      :aliases=>'reservedIpName'
+      	attribute :storage_allocated, :aliases=>'storageAllocated'
+      	attribute :creation_date,     :aliases=>'creationDate'
+        attribute :service_name
+
+      	def ip_addr
+          reserved_ip.blank? ? hostname : reserved_ip
+        end
+
+        def ready?
+          status == "Ready"
+        end
+
+        def scale(shape)
+          if !%w(oc3 oc4 oc5 oc6 oc1m oc2m oc3m oc4m).include? shape then
+            raise ArgumentError, "Invalid Shape. Valid values - oc3, oc4, oc5, oc6, oc1m, oc2m, oc3m or oc4m"
+          end
+          service.scale_a_node(service_name, name, :shape=>shape)
+        end
+
+        def scale_in_a_cluster
+          requires :service_name, :identity
+          service.scale_in_a_cluster(service_name, identity)
+        end
+
+        def reload
+          requires :identity, :service_name
+
+          data = begin
+            collection.get(service_name, identity)
+          rescue Excon::Errors::SocketError
+            nil
+          end
+
+          return unless data
+
+          new_attributes = data.attributes
+          merge_attributes(new_attributes)
+          self
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/models/java/servers.rb

@@ -1,25 +1,25 @@
-require 'fog/core/collection'
-
-module Fog
-  module OracleCloud
-    class Java
-      class Servers < Fog::Collection
-
-        model Fog::OracleCloud::Java::Server
-
-        def all(service_name)
-          data = service.list_servers(service_name).body['servers']
-          data.each { |s| s['service_name'] = service_name }
-          load(data)
-        end
-
-        def get(service_name, server_name)
-          data = service.get_server(service_name, server_name).body['servers'].first
-          data['service_name'] = service_name          
-          new(data)
-        end
-
-      end
-    end
-  end
-end
+require 'fog/core/collection'
+
+module Fog
+  module OracleCloud
+    class Java
+      class Servers < Fog::Collection
+
+        model Fog::OracleCloud::Java::Server
+
+        def all(service_name)
+          data = service.list_servers(service_name).body['servers']
+          data.each { |s| s['service_name'] = service_name }
+          load(data)
+        end
+
+        def get(service_name, server_name)
+          data = service.get_server(service_name, server_name).body['servers'].first
+          data['service_name'] = service_name          
+          new(data)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/models/soa/instance.rb

@@ -1,163 +1,163 @@
-require 'fog/core/model'
-
-module Fog
-  module OracleCloud
-    class SOA
-      class Instance < Fog::Model
-        identity  :service_name,              :aliases=>'serviceName'
-
-        attribute :service_type
-        attribute :resource_count
-        attribute :status
-        attribute :description
-        attribute :identity_domain
-        attribute :creation_job_id
-        attribute :creation_time
-        attribute :last_modified_time
-        attribute :created_by
-        attribute :service_uri
-        attribute :provisioning_progress
-        attribute :db_service_name,           :aliases=>'dbServiceName'
-        attribute :num_nodes,                 :aliases=>'managedServerCount'
-        attribute :shape
-        attribute :version
-        attribute :ssh_key,                   :aliases=>'vmPublicKey'
-
-        # The following are only used to create an instance and are not returned in the list action
-        attribute :cloud_storage_container,   :aliases=>'cloudStorageContainer'
-        attribute :cloud_storage_user,        :aliases=>'cloudStorageUser'
-        attribute :cloud_storage_pwd,         :aliases=>'cloudStoragePassword'
-        attribute :level
-        attribute :subscription_type,         :aliases=>'subscriptionType'
-        attribute :topology
-        attribute :admin_username,            :aliases=>'adminUserName'
-        attribute :admin_password,            :aliases=>'adminPassword'
-        attribute :dba_name,                  :aliases=>'dbaName'
-        attribute :dba_password,              :aliases=>'dbaPassword'
-        attribute :provision_otd,             :aliases=>'provisionOtd'
-
-        # The following are used to delete an instance and are not returned in the list action
-        attribute :dba_password
-        attribute :force_delete
-        attribute :skip_backup
-
-        def service_name=(value)
-          if value.include? '_' or !(value[0] =~ /[[:alpha:]]/) or value.size > 50 or !(value[/[a-zA-Z0-9-]+/]  == value)
-            raise ArgumentError, "Invalid service name. Names must be less than 50 characters; must start with a letter and can only contain letters, numbers and hyphens (-); can not end with a hyphen"
-          else
-            attributes[:service_name] = value
-          end
-        end
-
-        def topology=(value)
-          if %w(osb soa soaosb b2b mft apim insight).include? value then
-            attributes[:topology]=value
-          else
-            raise ArgumentError, "Invalid topology. Valid values - osb, soa, soaosb, b2b, mft, apim, insight"
-          end
-        end
-
-        def num_nodes=(value)
-          if value.nil? then value = 1 end
-          if [1, 2, 4].include? value.to_i then
-            attributes[:num_nodes] = value.to_i
-          else
-            raise ArgumentError, "Invalid server count (#{value}). Valid values - 1, 2 or 4"
-          end
-        end
-
-        def shape=(value)
-          if %w( oc1m oc2m oc3m oc4m oc5m).include? value then
-            attributes[:shape]=value
-          else
-            raise ArgumentError, "Invalid Shape. Valid values - oc1m, oc2m, oc3m, oc4m or oc5m"
-          end
-        end
-
-        def admin_password=(value)
-          if !(value[0] =~ /[[:alpha:]]/) or value.size < 8 or value.size > 30 or !(value =~ /[_#$]/) or !(value =~ /[0-9]/)
-            raise ArgumentError, "Invalid admin password. Password must be between 8 and 30 characters in length; must start with a letter and can only contain letters, numbers and $, \#, _"
-          else
-            attributes[:admin_password] = value
-          end
-        end
-
-        def save
-          #identity ? update : create
-          create
-        end
-
-        def ready?
-          status == "Running"
-        end
-
-        def stopping?
-          status == 'Maintenance' || status == 'Terminating'
-        end
-
-        def stopped?
-          status == 'Stopped'
-        end
-
-        def destroy(dba_name, dba_password)
-          requires :service_name
-          service.delete_instance(service_name, dba_name, dba_password, 
-                                            :force_delete => force_delete,
-                                            :skip_backup => skip_backup).body
-        end
-
-        def job_status
-          requires :creation_job_id
-          service.get_job_status('create', creation_job_id)
-        end
-
-        private
-
-        def create
-          requires :service_name, :dba_name, :dba_password, :db_service_name, :shape, :version, :ssh_key, :admin_password, :admin_username, :topology
-
-          stor_user = cloud_storage_user || service.username
-          stor_pwd = cloud_storage_pwd || service.password
-
-          if cloud_storage_container.nil? then
-            cloud_storage_container = "#{service_name}_Backup"
-            begin
-              container = Fog::Storage[:oraclecloud].containers.get(cloud_storage_container)
-            rescue Excon::Error::NotFound => error
-              # Doesn't exist, create it first
-              # The Oracle Cloud currently doesn't create a storage container for us, if it doesn't exist. Do it manually now
-              container = Fog::Storage[:oraclecloud].containers.create(
-                :name     => cloud_storage_container,
-              )
-            end
-          end
-
-          params = {            
-            :serviceName => service_name,
-            :cloudStorageContainer => cloud_storage_container,
-            :cloudStoragePassword => stor_pwd,
-            :cloudStorageUser => stor_user,
-            :description => description,
-            :provisionOTD => provision_otd.nil? ? false : provision_otd,
-            :subscriptionType => 'MONTHLY',
-            :level => 'PAAS',
-            :topology => topology
-          }
-          options = {
-            :adminPassword => admin_password,
-            :adminUserName => admin_username,
-            :dbaName => dba_name,
-            :dbaPassword => dba_password,
-            :dbServiceName => db_service_name,
-            :managedServerCount => num_nodes || 1,
-            :shape => shape,
-            :VMsPublicKey => ssh_key,
-            :version => version
-          }
-
-          data = service.create_instance(params, options)
-        end
-      end
-    end
-  end
-end
+require 'fog/core/model'
+
+module Fog
+  module OracleCloud
+    class SOA
+      class Instance < Fog::Model
+        identity  :service_name,              :aliases=>'serviceName'
+
+        attribute :service_type
+        attribute :resource_count
+        attribute :status
+        attribute :description
+        attribute :identity_domain
+        attribute :creation_job_id
+        attribute :creation_time
+        attribute :last_modified_time
+        attribute :created_by
+        attribute :service_uri
+        attribute :provisioning_progress
+        attribute :db_service_name,           :aliases=>'dbServiceName'
+        attribute :num_nodes,                 :aliases=>'managedServerCount'
+        attribute :shape
+        attribute :version
+        attribute :ssh_key,                   :aliases=>'vmPublicKey'
+
+        # The following are only used to create an instance and are not returned in the list action
+        attribute :cloud_storage_container,   :aliases=>'cloudStorageContainer'
+        attribute :cloud_storage_user,        :aliases=>'cloudStorageUser'
+        attribute :cloud_storage_pwd,         :aliases=>'cloudStoragePassword'
+        attribute :level
+        attribute :subscription_type,         :aliases=>'subscriptionType'
+        attribute :topology
+        attribute :admin_username,            :aliases=>'adminUserName'
+        attribute :admin_password,            :aliases=>'adminPassword'
+        attribute :dba_name,                  :aliases=>'dbaName'
+        attribute :dba_password,              :aliases=>'dbaPassword'
+        attribute :provision_otd,             :aliases=>'provisionOtd'
+
+        # The following are used to delete an instance and are not returned in the list action
+        attribute :dba_password
+        attribute :force_delete
+        attribute :skip_backup
+
+        def service_name=(value)
+          if value.include? '_' or !(value[0] =~ /[[:alpha:]]/) or value.size > 50 or !(value[/[a-zA-Z0-9-]+/]  == value)
+            raise ArgumentError, "Invalid service name. Names must be less than 50 characters; must start with a letter and can only contain letters, numbers and hyphens (-); can not end with a hyphen"
+          else
+            attributes[:service_name] = value
+          end
+        end
+
+        def topology=(value)
+          if %w(osb soa soaosb b2b mft apim insight).include? value then
+            attributes[:topology]=value
+          else
+            raise ArgumentError, "Invalid topology. Valid values - osb, soa, soaosb, b2b, mft, apim, insight"
+          end
+        end
+
+        def num_nodes=(value)
+          if value.nil? then value = 1 end
+          if [1, 2, 4].include? value.to_i then
+            attributes[:num_nodes] = value.to_i
+          else
+            raise ArgumentError, "Invalid server count (#{value}). Valid values - 1, 2 or 4"
+          end
+        end
+
+        def shape=(value)
+          if %w( oc1m oc2m oc3m oc4m oc5m).include? value then
+            attributes[:shape]=value
+          else
+            raise ArgumentError, "Invalid Shape. Valid values - oc1m, oc2m, oc3m, oc4m or oc5m"
+          end
+        end
+
+        def admin_password=(value)
+          if !(value[0] =~ /[[:alpha:]]/) or value.size < 8 or value.size > 30 or !(value =~ /[_#$]/) or !(value =~ /[0-9]/)
+            raise ArgumentError, "Invalid admin password. Password must be between 8 and 30 characters in length; must start with a letter and can only contain letters, numbers and $, \#, _"
+          else
+            attributes[:admin_password] = value
+          end
+        end
+
+        def save
+          #identity ? update : create
+          create
+        end
+
+        def ready?
+          status == "Running"
+        end
+
+        def stopping?
+          status == 'Maintenance' || status == 'Terminating'
+        end
+
+        def stopped?
+          status == 'Stopped'
+        end
+
+        def destroy(dba_name, dba_password)
+          requires :service_name
+          service.delete_instance(service_name, dba_name, dba_password, 
+                                            :force_delete => force_delete,
+                                            :skip_backup => skip_backup).body
+        end
+
+        def job_status
+          requires :creation_job_id
+          service.get_job_status('create', creation_job_id)
+        end
+
+        private
+
+        def create
+          requires :service_name, :dba_name, :dba_password, :db_service_name, :shape, :version, :ssh_key, :admin_password, :admin_username, :topology
+
+          stor_user = cloud_storage_user || service.username
+          stor_pwd = cloud_storage_pwd || service.password
+
+          if cloud_storage_container.nil? then
+            cloud_storage_container = "#{service_name}_Backup"
+            begin
+              container = Fog::Storage[:oraclecloud].containers.get(cloud_storage_container)
+            rescue Excon::Error::NotFound => error
+              # Doesn't exist, create it first
+              # The Oracle Cloud currently doesn't create a storage container for us, if it doesn't exist. Do it manually now
+              container = Fog::Storage[:oraclecloud].containers.create(
+                :name     => cloud_storage_container,
+              )
+            end
+          end
+
+          params = {            
+            :serviceName => service_name,
+            :cloudStorageContainer => cloud_storage_container,
+            :cloudStoragePassword => stor_pwd,
+            :cloudStorageUser => stor_user,
+            :description => description,
+            :provisionOTD => provision_otd.nil? ? false : provision_otd,
+            :subscriptionType => 'MONTHLY',
+            :level => 'PAAS',
+            :topology => topology
+          }
+          options = {
+            :adminPassword => admin_password,
+            :adminUserName => admin_username,
+            :dbaName => dba_name,
+            :dbaPassword => dba_password,
+            :dbServiceName => db_service_name,
+            :managedServerCount => num_nodes || 1,
+            :shape => shape,
+            :VMsPublicKey => ssh_key,
+            :version => version
+          }
+
+          data = service.create_instance(params, options)
+        end
+      end
+    end
+  end
+end