cfcm 0.0.6 → 0.0.7

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+notifications:
+  email: false

data/Gemfile

@@ -1,3 +1,10 @@
-gem 'vmc', "0.4.0.beta.36"
+source 'https://rubygems.org'
+
+gem 'cfoundry', '0.3.36'
 gem 'eventmachine', "0.12.10"
-gem 'rbvmomi', "1.5.1"
+gem 'rbvmomi', "1.5.1"
+
+group :test do
+  gem 'rake', '0.9.2.2'
+  gem 'rspec', '2.11.0'
+end

data/Gemfile.lock

@@ -1,67 +1,40 @@
 GEM
+  remote: https://rubygems.org/
   specs:
-    addressable (2.2.6)
     builder (3.0.0)
-    cfoundry (0.3.23)
+    cfoundry (0.3.36)
       multi_json (~> 1.3.6)
       rest-client (~> 1.6.1)
-      rubyzip (~> 0.9.5)
-    crack (0.3.1)
+      rubyzip (~> 0.9.9)
+    diff-lcs (1.1.3)
     eventmachine (0.12.10)
-    interact (0.4.7)
-    json_pure (1.6.7)
-    manifests-vmc-plugin (0.4.3)
-      cfoundry (~> 0.3.9)
     mime-types (1.19)
-    mothership (0.0.14)
     multi_json (1.3.6)
     nokogiri (1.5.5)
     rake (0.9.2.2)
-    rb-readline (0.4.2)
     rbvmomi (1.5.1)
       builder
       nokogiri (>= 1.4.1)
       trollop
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (1.3.2)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
     rubyzip (0.9.9)
-    simplecov (0.6.4)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    terminal-table (1.4.5)
     trollop (2.0)
-    uuidtools (2.1.3)
-    vmc (0.4.0.beta.36)
-      addressable (~> 2.2.6)
-      cfoundry (~> 0.3.23)
-      interact (~> 0.4.0)
-      interact (~> 0.4.7)
-      json_pure (>= 1.5.1, < 1.7.0)
-      json_pure (~> 1.6.5)
-      manifests-vmc-plugin (~> 0.4.3)
-      mothership (~> 0.0.14)
-      multi_json (~> 1.3.6)
-      rake
-      rake
-      rb-readline (~> 0.4.2)
-      rest-client (>= 1.6.1, < 1.7.0)
-      rspec
-      rspec (~> 1.3.0)
-      rubyzip (~> 0.9.4)
-      simplecov
-      terminal-table (~> 1.4.2)
-      uuidtools (~> 2.1.0)
-      webmock (~> 1.5.0)
-    webmock (1.5.0)
-      addressable (>= 2.2.2)
-      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  cfoundry (= 0.3.36)
   eventmachine (= 0.12.10)
+  rake (= 0.9.2.2)
   rbvmomi (= 1.5.1)
-  vmc (= 0.4.0.beta.36)
+  rspec (= 2.11.0)

data/README.md

@@ -1,5 +1,7 @@
 #cloudfoundry-chaos-monkey
 
+[![Build Status](https://secure.travis-ci.org/BrianMMcClain/cloudfoundry-chaos-monkey.png)](http://travis-ci.org/BrianMMcClain/cloudfoundry-chaos-monkey)
+
 Chaos Monkey style service for Cloud Foundry
 
 ##Using Cloud Foundry Chaos Monkey

data/Rakefile

@@ -1,2 +1,7 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/cfcm.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.version       = CFCM::VERSION
   
   gem.add_dependency "thor"
-  gem.add_dependency "vmc"
+  gem.add_dependency "cfoundry"
 end

data/lib/cfcm/cf.rb

@@ -1,12 +1,12 @@
-require 'vmc'
+require 'cfoundry'
 
 module CFCM
   module CF
     class Session    
       def initialize(target, username, password)
         begin
-          @client = VMC::Client.new(target)
-          @client.login(username, password)
+          @client = CFoundry::V1::Client.new(target)
+          @client.login({:username => username, :password => password})
         rescue
           #puts "Could not login!"
           #TODO: Handle error
@@ -15,7 +15,7 @@ module CFCM
       end
       
       def is_logged_in
-        return @client.auth_token != nil
+        return @client.logged_in?
       end
       
       def get_app(app_name)
@@ -25,14 +25,7 @@ module CFCM
           return
         end
         
-        @client.apps.each do |app|
-          if app[:name] == app_name
-            return app
-          end
-        end
-        
-        #puts "Application Not Found"
-        #TODO: Handle error
+        return @client.app_by_name(app_name)
         return nil
       end
       
@@ -61,22 +54,22 @@ module CFCM
         
         remaining_memory = self.remaining_memory
         app = self.get_app(app_name)
-        app_memory = app[:resources][:memory]
+        app_memory = app.memory
         
         max_new_instances = (remaining_memory / app_memory).floor
         return max_new_instances
       end
       
       def add_instance(app)
-        app[:instances] += 1
-        @client.update_app(app[:name], app)
-        return app
+        app.total_instances += 1
+        app.update!
+        return self.get_app(app.name)
       end
       
       def remove_instance(app)
-        app[:instances] -= 1
-        @client.update_app(app[:name], app)
-        return app
+        app.total_instances -= 1
+        app.update!
+        return self.get_app(app.name)
       end
       
     end

data/lib/cfcm/iaas/vsphere.rb

@@ -14,9 +14,9 @@ module CFCM
       def power_off_vm(vm_name)
         opts = {:host=>@host, :user=>@user, :password=>@password, :insecure=>true}
         vim = RbVmomi::VIM.connect opts
-        dc = vim.serviceInstance.content.rootFolder.traverse(config["datacenter"], RbVmomi::VIM::Datacenter) or abort "datacenter not found"
-        vm = dc.vmFolder.traverse(vm_name, VIM::VirtualMachine) or abort "VM not found"
-        vm.PowerOffVM_Task.wait_for_completion
+        dc = vim.serviceInstance.content.rootFolder.traverse(@config["datacenter"], RbVmomi::VIM::Datacenter) or abort "datacenter not found"
+        vm = dc.vmFolder.traverse(vm_name, RbVmomi::VIM::VirtualMachine) or abort "VM not found"
+        vm.PowerOffVM_Task.wait_for_completion        
       end
         
     end

data/lib/cfcm/monkey.rb

@@ -22,7 +22,7 @@ module CFCM
             # Determine if we should unleash the monkey
             if (Random.rand(100) + 1) <= @probability
               @app = @session.get_app(@app_name)
-              instances = @app[:instances]
+              instances = @app.total_instances
               max_growth = @session.max_instance_growth(@app_name)
               
               if instances > @max_instances

data/lib/cfcm/version.rb

@@ -1,3 +1,3 @@
 module CFCM
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfcm
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vmc
+  name: cfoundry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -52,6 +52,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -89,4 +90,3 @@ signing_key:
 specification_version: 3
 summary: ''
 test_files: []
-has_rdoc: