fog-oraclecloud 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c2dc92beba08b205fe11d1feafdbbfef60d966c
-  data.tar.gz: 2945d61da09d730a8ed125ca3fda8414fb75643a
+  metadata.gz: 40ac334d431df46adddc51157496f18855c1fffc
+  data.tar.gz: c095bd4efaaa18969bf2cd199b17a50a01b6fd00
 SHA512:
-  metadata.gz: c69b759119682368a25e3e5e92a03904066405a352e695637babe693ba7b6e39267d93519dd10a56c278e1658e538de466070cf3e81c1ea2eb259a3cf02088d4
-  data.tar.gz: 2ff5fb6fe6fe9e028234840d4eb144e71f703fb1c0f6e36f75d188b0099d7e598fe7335f6b7e74589e877a19699668eba10f5ed7a3b71f69f5cbc586b24beb7b
+  metadata.gz: 40f8369ed1c352d7f01aa58049d3f01cc9c6de10003ce33d561b4b6c85031f52d3cc6e721e6f2c4abc3db175961bfa62a1d5489f8ea3f7e2e26c2fcf7381fb92
+  data.tar.gz: 1e1f14e46d845209d6e9afa6876a7547b55a81dce4539c43e92baebc546b787a140d1b9ab0c55e0554985df4656f237710ddede63d7237ce131df47157676e37

data/lib/fog/oraclecloud/java.rb

@@ -16,6 +16,10 @@ module Fog
       request :get_instance
       request :delete_instance
       request :list_servers
+      request :get_server
+      request :scale_out_a_cluster
+      request :scale_in_a_cluster
+      request :scale_a_node
 
       class Real
 
@@ -92,6 +96,7 @@ module Fog
           @data ||= {
             :instances => {},
             :servers => {},
+            :maintenance_at => {},
             :deleted_at => {},
             :created_at => {}
           }

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

@@ -123,14 +123,6 @@ module Fog
           end
         end
 
-        def num_nodes=(value)
-          if value.nil? then value = 1 end
-          if [1, 2, 4, 8].include? value.to_i then
-            attributes[:num_nodes] = value.to_i
-          else
-            raise ArgumentError, "Invalid server count (#{value}). Valid values - 1, 2, 4 or 8"
-          end
-        end
 
         def shape=(value)
           if %w(oc3 oc4 oc5 oc6 oc1m oc2m oc3m oc4m).include? value then
@@ -140,7 +132,14 @@ module Fog
           end
         end
 
-
+        def num_nodes=(value)
+          if value.nil? then value = 1 end
+          if value.to_i.is_a? Integer then
+            attributes[:num_nodes] = value.to_i
+          else
+            raise ArgumentError, "Invalid server count (#{value}). Valid values - 1, 2, 4 or 8"
+          end
+        end
 
         def initialize(attributes={})
           level ||= 'PAAS'
@@ -176,6 +175,11 @@ module Fog
           service.delete_instance(service_name, dba_name, dba_password, :force_delete => force_delete).body
         end
 
+        def scale_out_a_cluster(cluster_name, create_cluster_if_missing)
+          requires :service_name
+          service.scale_out_a_cluster(service_name, cluster_name, create_cluster_if_missing).body
+        end
+
         private
 
         def create

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

@@ -7,19 +7,55 @@ module Fog
       	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=>'is_admin'
+      	attribute :is_admin,         :aliases=>'isAdmin'
       	attribute :hostname
       	attribute :status
-      	attribute :reserved_ip,      :aliases=>'reserved_ip'
+      	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

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

@@ -9,8 +9,16 @@ module Fog
 
         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

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

@@ -75,7 +75,8 @@ module Fog
             "storageAllocated": 74752,
             "creationDate": Time.now.strftime('%Y-%b-%dT%H:%M:%S')
           }
-          self.data[:servers][data['serviceName']] = [server]
+          self.data[:servers][data['serviceName']] = {}
+          self.data[:servers][data['serviceName']][server[:name]] = server
 
           response.status = 202
           response

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

@@ -0,0 +1,43 @@
+module Fog
+  module OracleCloud
+    class Java
+      class Real
+
+      	def get_server(service_name, server_name)
+ 					response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/paas/service/jcs/api/v1.1/instances/#{@identity_domain}/#{service_name}/servers/#{server_name}"
+          )
+          response
+        end
+      end
+
+      class Mock
+        def get_server(service_name, server_name)
+          response = Excon::Response.new
+
+          if server = self.data[:servers][service_name][server_name]
+            case server[:status]
+            when 'Maintenance'
+              info = self.data[:maintenance_at][server_name]
+              if Time.now - info['time'] >= Fog::Mock.delay
+                self.data[:servers][service_name][server_name][:status] = 'Ready'
+                self.data[:servers][service_name][server_name][info['attribute']] = info['value']
+                self.data[:maintenance_at].delete(server_name)
+              end
+            end
+            
+            response.status = 200           
+            response.body =  {
+              'servers' => self.data[:servers][service_name].values
+            }
+            response
+          else
+            raise Fog::OracleCloud::Java::NotFound.new("Java Server #{name} does not exist");
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -19,7 +19,7 @@ module Fog
           servers = self.data[:servers][db_name]
 
           response.body =  {
-            'servers' => servers
+            'servers' => servers.values
           }
 
           response

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

@@ -0,0 +1,46 @@
+module Fog
+  module OracleCloud
+    class Java
+      class Real
+
+      	def scale_a_node(service_name, server_name, options={})
+
+          path = "/paas/service/jcs/api/v1.1/instances/#{@identity_domain}/#{service_name}/#{server_name}"
+          body_data     = {
+            'shape'             => options[:shape],
+            'additionalStorage' => options[:additionalStorage],
+            'ignoreManagedServerHeapError' =>  options[:ignoreManagedServerHeapError],
+            'scalingVolume'             => options[:scalingVolume]
+          }
+          body_data = body_data.reject {|key, value| value.nil?}
+
+ 		      response = request(
+            :expects  => 202,
+            :method   => 'PUT',
+            :path     => path,
+            :body     => Fog::JSON.encode(body_data)
+          )
+          response
+        end
+      end
+
+      class Mock
+        def scale_a_node(service_name, server_name, options={})
+      	  response = Excon::Response.new
+
+          response.status = 202
+          self.data[:servers][service_name][server_name][:status] = 'Ready'
+          self.data[:servers][service_name][server_name][:shape] = options[:shape]
+          response.body = {
+            "status" => "New", 
+            "details" => {
+              "message" => "scaleup.job.submitted", 
+              "jobId" => rand(10000).to_s
+            }
+          }
+          response
+      	end
+      end
+    end
+  end
+end

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

@@ -0,0 +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
+end

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

@@ -0,0 +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
+end

data/lib/fog/oraclecloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OracleCloud
-    VERSION = "0.1.11"
+    VERSION = "0.1.12"
   end
 end

data/tests/requests/java_tests.rb

@@ -56,6 +56,45 @@ Shindo.tests('Fog::Java[oraclecloud] | java requests', 'java') do
 		end
 	end
 
+	tests('test jcs scaling ') do
+	  scale_out_server_name = 'TestWLS_server_1'
+    test_service_name = 'TestWLS'
+ 
+		test "scale out a cluster" do
+		  instance = Fog::OracleCloud[:java].instances.get(test_service_name)
+			instance.scale_out_a_cluster('testcluster',false)
+			Fog::OracleCloud[:java].instances.get(test_service_name).wait_for(1800) { ready? }
+			Fog::OracleCloud[:java].instances.get(test_service_name).ready?			
+		end
+
+    test('get server') do
+      instance = Fog::OracleCloud[:java].instances.get(test_service_name)
+      instance.ready? 
+      server = instance.servers.get(test_service_name,scale_out_server_name)
+      server.ready?   
+    end
+    
+  	test "scale a node" do
+  	  instance = Fog::OracleCloud[:java].instances.get(test_service_name)
+  		instance.ready? 
+  		server = instance.servers.get(test_service_name,scale_out_server_name)
+  		server.scale('oc4')
+  		Fog::OracleCloud[:java].instances.get(test_service_name).wait_for(1800) { ready? }
+  		server = instance.servers.get(test_service_name,scale_out_server_name)
+  		server.ready?
+  		server.shape == 'oc4'
+  	end
+  
+  	test "scale in a cluster" do
+  	  instance = Fog::OracleCloud[:java].instances.get(test_service_name)
+  		instance.ready? 
+  		instance.servers.get(test_service_name,scale_out_server_name).scale_in_a_cluster
+  		Fog::OracleCloud[:java].instances.get(test_service_name).wait_for(1800) { ready? }
+  		Fog::OracleCloud[:java].instances.get(test_service_name).ready?
+  	end
+  
+  end
+	
 	tests("#java-delete", "create") do
 		instance = Fog::OracleCloud[:java].instances.get('TestWLS')
 		instance.dba_name = 'Admin',
@@ -66,4 +105,6 @@ Shindo.tests('Fog::Java[oraclecloud] | java requests', 'java') do
 			instance.wait_for { stopped? } 
 		end
 	end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-oraclecloud
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Joel Nation
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-30 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -245,6 +245,9 @@ files:
 - lib/fog/oraclecloud/requests/java/get_server.rb
 - lib/fog/oraclecloud/requests/java/list_instances.rb
 - lib/fog/oraclecloud/requests/java/list_servers.rb
+- lib/fog/oraclecloud/requests/java/scale_a_node.rb
+- lib/fog/oraclecloud/requests/java/scale_in_a_cluster.rb
+- lib/fog/oraclecloud/requests/java/scale_out_a_cluster.rb
 - lib/fog/oraclecloud/requests/soa/create_instance.rb
 - lib/fog/oraclecloud/requests/soa/delete_instance.rb
 - lib/fog/oraclecloud/requests/soa/get_instance.rb