fog-oraclecloud 0.1.12 → 0.1.13

data/lib/fog/oraclecloud/requests/java/scale_in_a_cluster.rb

@@ -1,36 +1,36 @@
-module Fog
-  module OracleCloud
-    class Java
-      class Real
-
-      	def scale_in_a_cluster(service_name, server_name)
-
-          path = "/paas/service/jcs/api/v1.1/instances/#{@identity_domain}/#{service_name}/servers/#{server_name}"
-
- 		  response = request(
-            :expects  => 202,
-            :method   => 'DELETE',
-            :path     => path
-          )
-          response
-        end
-      end
-
-      class Mock
-        def scale_in_a_cluster(service_name, server_name)
-      	  response = Excon::Response.new
-
-          response.status = 202
-          response.body = {
-            "status" => "New", 
-            "details" => {
-              "message" => "JAAS-SCALING-044: Scaling in Job (ID: 20) server name [ExampleI_server_4] submitted for service [ExampleInstance]", 
-              "jobId" => "20"
-            }
-          }
-          response
-      	end
-      end
-    end
-  end
+module Fog
+  module OracleCloud
+    class Java
+      class Real
+
+      	def scale_in_a_cluster(service_name, server_name)
+
+          path = "/paas/service/jcs/api/v1.1/instances/#{@identity_domain}/#{service_name}/servers/#{server_name}"
+
+ 		  response = request(
+            :expects  => 202,
+            :method   => 'DELETE',
+            :path     => path
+          )
+          response
+        end
+      end
+
+      class Mock
+        def scale_in_a_cluster(service_name, server_name)
+      	  response = Excon::Response.new
+
+          response.status = 202
+          response.body = {
+            "status" => "New", 
+            "details" => {
+              "message" => "JAAS-SCALING-044: Scaling in Job (ID: 20) server name [ExampleI_server_4] submitted for service [ExampleInstance]", 
+              "jobId" => "20"
+            }
+          }
+          response
+      	end
+      end
+    end
+  end
 end

data/lib/fog/oraclecloud/requests/java/scale_out_a_cluster.rb

@@ -1,39 +1,39 @@
-module Fog
-  module OracleCloud
-    class Java
-      class Real
-
-      	def scale_out_a_cluster(service_name, cluster_name, create_cluster_if_missing)
-
-          path = "/paas/service/jcs/api/v1.1/instances/#{@identity_domain}/#{service_name}/servers/#{cluster_name}"
-          if create_cluster_if_missing then
-            path = "#{path}?createClusterIfMissing=true"
-          end
-
- 		      response = request(
-            :expects  => 202,
-            :method   => 'POST',
-            :path     => path
-          )
-          response
-        end
-      end
-
-      class Mock
-        def scale_out_a_cluster(service_name, cluster_name, create_cluster_if_missing)
-      		response = Excon::Response.new
-
-          response.status = 202
-          response.body = {
-            "status" => "New", 
-            "details" => {
-              "message" => "JASS-SCALING-037: Scale out Job (ID: 17) for service [ExampleInstance] in cluster [ExampleI_cluster] submitted", 
-              "jobId" => "17"
-            }
-          }
-          response
-      	end
-      end
-    end
-  end
+module Fog
+  module OracleCloud
+    class Java
+      class Real
+
+      	def scale_out_a_cluster(service_name, cluster_name, create_cluster_if_missing)
+
+          path = "/paas/service/jcs/api/v1.1/instances/#{@identity_domain}/#{service_name}/servers/#{cluster_name}"
+          if create_cluster_if_missing then
+            path = "#{path}?createClusterIfMissing=true"
+          end
+
+ 		      response = request(
+            :expects  => 202,
+            :method   => 'POST',
+            :path     => path
+          )
+          response
+        end
+      end
+
+      class Mock
+        def scale_out_a_cluster(service_name, cluster_name, create_cluster_if_missing)
+      		response = Excon::Response.new
+
+          response.status = 202
+          response.body = {
+            "status" => "New", 
+            "details" => {
+              "message" => "JASS-SCALING-037: Scale out Job (ID: 17) for service [ExampleInstance] in cluster [ExampleI_cluster] submitted", 
+              "jobId" => "17"
+            }
+          }
+          response
+      	end
+      end
+    end
+  end
 end

data/lib/fog/oraclecloud/requests/soa/create_instance.rb

@@ -1,71 +1,71 @@
-module Fog
-  module OracleCloud
-    class SOA
-      class Real
-        def create_instance(config, options)  
-          if !config[:cloudStorageContainer].start_with?("/Storage-")
-            config[:cloudStorageContainer] = "/Storage-#{@identity_domain}/#{config[:cloudStorageContainer]}"
-          end
-
-          parameters = options.select{|key, value| [:adminPassword, :adminPort, :adminUserName, :backupVolumeSize, :clusterName, :contentPort, :dbaName, :dbaPassword, :dbServiceName, :deploymentChannelPort, :domainMode, :domainName, :domainPartitionCount, :domainVolumeSize, :edition, :ipReservations, :managedServerCount, :msInitialHeapMB, :msJvmArgs, :msMaxHeapMB, :msMaxPermMB, :msPermMb, :nodeManagerPassword, :nodeManagerPort, :nodeManagerUserName, :overwriteMsJvmArgs, :pdbName, :securedAdminPort, :securedContentPort, :shape, :VMsPublicKey, :version].include?(key)}
-          parameters.reject! { |key,value| value.nil?}
-          config.reject! { |key,value| value.nil?}
-          # Currently only support weblogic
-          parameters[:type] = "weblogic"
-          config[:parameters] = [parameters]
-          body_data = config
-
-          request({
-            :method   => 'POST',
-            :expects  => 202,
-            :path     => "/paas/service/soa/api/v1.1/instances/#{@identity_domain}",
-            :body     => Fog::JSON.encode(body_data),
-            :headers  => {
-             'Content-Type'=>'application/json'
-            }
-          }, false)
-        end
-      end
-
-      class Mock
-        def create_instance(config, options)
-          response = Excon::Response.new
-
-          ip = '192.168.1.1'
-          data = {
-            'status' => 'In Progress',
-            'compute_site_name' => 'EM002_Z11',
-            'content_url' => "http://#{ip}",
-            'created_by' => @username,
-            'creation_job_id' => Random.rand(100000),
-            'creation_time'=> Time.now.strftime('%Y-%b-%dT%H:%M:%S'),
-            'last_modified_time'=> Time.now.strftime('%Y-%b-%dT%H:%M:%S'),
-            'service_id' => Random.rand(100000),
-            'service_type' => config[:topology],
-            'service_uri'=>"#{@region_url}/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/#{config[:serviceName]}",
-           }
-            .merge(config.select {|key, value| [:serviceName, :description, :level, :subscriptionType].include?(key) })
-            .merge(options.select {|key, value| [:shape, :version].include?(key) }).collect{|k,v| [k.to_s, v]}.to_h
-
-          self.data[:instances][config[:serviceName]] = data
-          self.data[:created_at][config[:serviceName]] = Time.now
-
-          server = {
-            "name": "#{data['serviceName'][0,8]}_server_1",
-            "shape": data['shape'],
-            "nodeType": "WLS",
-            "isAdmin": true,
-            "hostname": ip,
-            "status": "Ready",
-            "storageAllocated": 74752,
-            "creationDate": Time.now.strftime('%Y-%b-%dT%H:%M:%S')
-          }
-          self.data[:servers][data['serviceName']] = [server]
-
-          response.status = 202
-          response
-        end
-      end
-    end
-  end
-end
+module Fog
+  module OracleCloud
+    class SOA
+      class Real
+        def create_instance(config, options)  
+          if !config[:cloudStorageContainer].start_with?("/Storage-")
+            config[:cloudStorageContainer] = "/Storage-#{@identity_domain}/#{config[:cloudStorageContainer]}"
+          end
+
+          parameters = options.select{|key, value| [:adminPassword, :adminPort, :adminUserName, :backupVolumeSize, :clusterName, :contentPort, :dbaName, :dbaPassword, :dbServiceName, :deploymentChannelPort, :domainMode, :domainName, :domainPartitionCount, :domainVolumeSize, :edition, :ipReservations, :managedServerCount, :msInitialHeapMB, :msJvmArgs, :msMaxHeapMB, :msMaxPermMB, :msPermMb, :nodeManagerPassword, :nodeManagerPort, :nodeManagerUserName, :overwriteMsJvmArgs, :pdbName, :securedAdminPort, :securedContentPort, :shape, :VMsPublicKey, :version].include?(key)}
+          parameters.reject! { |key,value| value.nil?}
+          config.reject! { |key,value| value.nil?}
+          # Currently only support weblogic
+          parameters[:type] = "weblogic"
+          config[:parameters] = [parameters]
+          body_data = config
+
+          request({
+            :method   => 'POST',
+            :expects  => 202,
+            :path     => "/paas/service/soa/api/v1.1/instances/#{@identity_domain}",
+            :body     => Fog::JSON.encode(body_data),
+            :headers  => {
+             'Content-Type'=>'application/json'
+            }
+          }, false)
+        end
+      end
+
+      class Mock
+        def create_instance(config, options)
+          response = Excon::Response.new
+
+          ip = '192.168.1.1'
+          data = {
+            'status' => 'In Progress',
+            'compute_site_name' => 'EM002_Z11',
+            'content_url' => "http://#{ip}",
+            'created_by' => @username,
+            'creation_job_id' => Random.rand(100000),
+            'creation_time'=> Time.now.strftime('%Y-%b-%dT%H:%M:%S'),
+            'last_modified_time'=> Time.now.strftime('%Y-%b-%dT%H:%M:%S'),
+            'service_id' => Random.rand(100000),
+            'service_type' => config[:topology],
+            'service_uri'=>"#{@region_url}/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/#{config[:serviceName]}",
+           }
+            .merge(config.select {|key, value| [:serviceName, :description, :level, :subscriptionType].include?(key) })
+            .merge(options.select {|key, value| [:shape, :version].include?(key) }).collect{|k,v| [k.to_s, v]}.to_h
+
+          self.data[:instances][config[:serviceName]] = data
+          self.data[:created_at][config[:serviceName]] = Time.now
+
+          server = {
+            "name": "#{data['serviceName'][0,8]}_server_1",
+            "shape": data['shape'],
+            "nodeType": "WLS",
+            "isAdmin": true,
+            "hostname": ip,
+            "status": "Ready",
+            "storageAllocated": 74752,
+            "creationDate": Time.now.strftime('%Y-%b-%dT%H:%M:%S')
+          }
+          self.data[:servers][data['serviceName']] = [server]
+
+          response.status = 202
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/requests/soa/delete_instance.rb

@@ -1,35 +1,35 @@
-module Fog
-  module OracleCloud
-    class SOA
-      class Real
-
-        def delete_instance(service_name, dba_name, dba_password, options={})
-          body_data = {
-            'dbaName'     => dba_name,
-            'dbaPassword' => dba_password,
-            'forceDelete' => options[:force_delete],
-            'skipBackupOnTerminate' => options[:skip_backup]
-          }
-
-          body_data = body_data.reject {|key, value| value.nil?}
-          request(
-            :method   => 'PUT',
-            :expects  => 202,
-            :path     => "/paas/service/soa/api/v1.1/instances/#{@identity_domain}/#{service_name}",
-            :body     => Fog::JSON.encode(body_data)
-          )
-        end
-      end
-
-      class Mock
-        def delete_instance(name, dba_name, dba_password, options={})
-          response = Excon::Response.new
-          self.data[:instances][name]['status'] = 'Terminating'
-          self.data[:deleted_at][name] = Time.now
-          response.status = 204
-          response
-        end
-      end
-    end
-  end
-end
+module Fog
+  module OracleCloud
+    class SOA
+      class Real
+
+        def delete_instance(service_name, dba_name, dba_password, options={})
+          body_data = {
+            'dbaName'     => dba_name,
+            'dbaPassword' => dba_password,
+            'forceDelete' => options[:force_delete],
+            'skipBackupOnTerminate' => options[:skip_backup]
+          }
+
+          body_data = body_data.reject {|key, value| value.nil?}
+          request(
+            :method   => 'PUT',
+            :expects  => 202,
+            :path     => "/paas/service/soa/api/v1.1/instances/#{@identity_domain}/#{service_name}",
+            :body     => Fog::JSON.encode(body_data)
+          )
+        end
+      end
+
+      class Mock
+        def delete_instance(name, dba_name, dba_password, options={})
+          response = Excon::Response.new
+          self.data[:instances][name]['status'] = 'Terminating'
+          self.data[:deleted_at][name] = Time.now
+          response.status = 204
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/requests/soa/get_instance.rb

@@ -1,43 +1,43 @@
-module Fog
-  module OracleCloud
-    class SOA
-      class Real
-
-      	def get_instance(instance_id)
- 					response = request(
-            :expects  => 200,
-            :method   => 'GET',
-            :path     => "/paas/service/soa/api/v1.1/instances/#{@identity_domain}/#{instance_id}"
-          )
-          response
-        end
-      end
-
-      class Mock
-        def get_instance(name)
-          response = Excon::Response.new
-          if instance = self.data[:instances][name]
-            case instance['status']
-            when 'Terminating'
-              if Time.now - self.data[:deleted_at][name] >= Fog::Mock.delay
-                self.data[:deleted_at].delete(name)
-                self.data[:instances].delete(name)
-              end
-            when 'In Progress'
-              if Time.now - self.data[:created_at][name] >= Fog::Mock.delay
-                self.data[:instances][name]['status'] = 'Running'
-                instance = self.data[:instances][name]
-                self.data[:created_at].delete(name)
-              end
-            end
-            response.status = 200
-            response.body = instance
-            response
-          else
-            raise Fog::OracleCloud::SOA::NotFound.new("SOA #{name} does not exist");
-          end
-        end
-      end
-    end
-  end
+module Fog
+  module OracleCloud
+    class SOA
+      class Real
+
+      	def get_instance(instance_id)
+ 					response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/paas/service/soa/api/v1.1/instances/#{@identity_domain}/#{instance_id}"
+          )
+          response
+        end
+      end
+
+      class Mock
+        def get_instance(name)
+          response = Excon::Response.new
+          if instance = self.data[:instances][name]
+            case instance['status']
+            when 'Terminating'
+              if Time.now - self.data[:deleted_at][name] >= Fog::Mock.delay
+                self.data[:deleted_at].delete(name)
+                self.data[:instances].delete(name)
+              end
+            when 'In Progress'
+              if Time.now - self.data[:created_at][name] >= Fog::Mock.delay
+                self.data[:instances][name]['status'] = 'Running'
+                instance = self.data[:instances][name]
+                self.data[:created_at].delete(name)
+              end
+            end
+            response.status = 200
+            response.body = instance
+            response
+          else
+            raise Fog::OracleCloud::SOA::NotFound.new("SOA #{name} does not exist");
+          end
+        end
+      end
+    end
+  end
 end