cfcm 0.0.2 → 0.0.3

data/lib/cfcm/cli.rb

@@ -6,10 +6,12 @@ module CFCM
     class Command < Thor
       
       desc "soft USERNAME PASSWORD APP", "Removes/Adds instances via VMC APIs"
-      method_option :target, :alias => ["--target"], :type => :string, :desc => "Cloud Foundry API Target URL"
+      method_option :target, :aliases => ["--target", "-t"], :type => :string, :desc => "Cloud Foundry API Target URL"
       method_option :min, :alias => ["--min"], :type => :numeric, :desc => "Minimum number of instances"
       method_option :max, :alias => ["--max"], :type => :numeric, :desc => "Maximum number of instances"
-      def soft(username, password, app, target = "http://api.cloudfoundry.com", min = 1, max = 5)
+      method_option :probability, :aliases => ["--probability", "-p"], :type => :numeric, :desc => "[1-100] Probablity for the Chaos Monkey to add/remove an instance"
+      method_option :frequency, :aliases => ["--frequency", "-f"], :type => :numeric, :desc => "Number of times to attempt to add/remove an instance"
+      def soft(username, password, app, target = "http://api.cloudfoundry.com", min = 1, max = 5, probability = 10, frequency = 10)
         
         if options[:target]
           target = options[:target]
@@ -18,22 +20,34 @@ module CFCM
           min = options[:min]
         end
         if options[:max]
-          min = options[:max]
+          max = options[:max]
+        end
+        if options[:probability]
+          if options[:probability] < 1 || options[:probability] > 100
+            puts "Probability must be between 1 and 100"
+            return
+          else
+            probability = options[:probability]
+          end
+        end
+        if options[:frequency]
+          frequency = options[:frequency]
         end
         
         require 'cfcm/cf'
         session = CFCM::CF::Session.new(target, username, password)
         if session.is_logged_in 
-          if session.app_exists(app)
-            puts "RELEASE THE MONKEY!"
-          else
+          if !session.app_exists(app)
             puts "Application not found"
+            return
           end
         else
           puts "Could not log in"
+          return
         end
         
-        monkey = CFCM::Monkey::SoftMonkey.new(session, app, 50, 1, 10)
+        puts "Awakening the monkey on #{app} with a #{probability}% chance of chaos every #{frequency} second#{frequency > 1? "s" : ""}"
+        monkey = CFCM::Monkey::SoftMonkey.new(session, app, probability, min, max, frequency)
         monkey.start
       end     
     end

data/lib/cfcm/monkey.rb

@@ -3,27 +3,35 @@ require "eventmachine"
 module CFCM
   module Monkey
     class SoftMonkey      
-      def initialize(session, app_name, probability, min, max)
+      def initialize(session, app_name, probability, min, max, frequency)
         @session = session
         @app_name = app_name
         @app = @session.get_app(app_name)
         @probability = probability
         @min_instances = min
         @max_instances = max
+        @frequency = frequency
       end
       
       def start
         EventMachine.run do
-          EventMachine.add_periodic_timer(10) do
+          EventMachine.add_periodic_timer(@frequency) do
             # Determine if we should unleash the monkey
             if (Random.rand(100) + 1) <= @probability
               @app = @session.get_app(@app_name)
               instances = @app[:instances]
-              max_instances = @session.max_instance_growth(@app_name)
-              if max_instances == 0 || @max_instances == instances
-                # Shrink
+              max_growth = @session.max_instance_growth(@app_name)
+              
+              if instances > @max_instances
                 puts "Shrink due to instance limitations"
+                @app = @session.remove_instance(@app)
+              elsif instances < @min_instances
+                puts "Grow due to instance limitations"
                 @app = @session.add_instance(@app)
+              elsif max_growth == 0 || @max_instances == instances
+                # Shrink
+                puts "Shrink due to instance limitations"
+                @app = @session.remove_instance(@app)
               elsif instances == @min_instances
                 # Grow
                 puts "Grow due to instance limitations"

data/lib/cfcm/version.rb

@@ -1,3 +1,3 @@
 module CFCM
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfcm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: