megam_api 0.13 → 0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a89e917fbfd15f7068d3212e2c9a6b14a689471c
-  data.tar.gz: 3ef8e5d63add9b4c3a8811969dd6e467a6922d1a
+  metadata.gz: 648894d0115816c314368168eea83b0652a95aec
+  data.tar.gz: 83dd55046ccfc9dcbd92fe5a93c5ec37bb780275
 SHA512:
-  metadata.gz: 0f0ac5caf0e46baece23ea5b71ebcf7884f5d8c29492a9339e9e934a8fefe2f90acda6e7fed27da8161e5c97b6b6c889e08f07dd944ae8baa86f0079f3b3c65a
-  data.tar.gz: 167c28d98d7d059b0a62118cc349ef896d3d9a6c53a6478dd5c66f45c672a381091aa3be7b9f92624881aab0c2d85648340ccb6bf90665949160f3eab178330f
+  metadata.gz: f4c050bba42496e59abcb765f6fab5f664f2b07d104f47737579f82a806279b08dfb636925ba4a062884c2f09c555992d9f03afe12ae8d2e482cd7be8adb50b9
+  data.tar.gz: aa046a0bd7cbc4b2e1760218739c26e57e9377d8f8c7f63fab83fa6b009c729f1ea3cee620c6c72143912b5b38682e1c430f4ce96c784e43399f592aa59a6aa3

data/lib/megam/api/appdefns.rb

@@ -31,6 +31,17 @@ module Megam
         :body     => @options[:body]
       )
     end
+    
+    def update_appdefn(new_appdefn)
+      @options = {:path => '/appdefns/update',
+        :body => Megam::JSONCompat.to_json(new_appdefn)}.merge(@options)
+
+      request(
+        :expects  => 201,
+        :method   => :post,
+        :body     => @options[:body]
+      )
+    end
 
   end
 end

data/lib/megam/api/boltdefns.rb

@@ -23,5 +23,17 @@ module Megam
       )
     end
 
+  def update_boltdefn(new_boltdefn)
+      @options = {:path => '/boltdefns/update',
+        :body => Megam::JSONCompat.to_json(new_boltdefn)}.merge(@options)
+
+      request(
+        :expects  => 201,
+        :method   => :post,
+        :body     => @options[:body]
+      )
+    end
+
+
   end
 end

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.13"
+    VERSION = "0.14"
   end
 end

data/lib/megam/builder/make_node.rb

@@ -101,8 +101,8 @@ module Megam
         "command" => command_hash,
         "predefs" => {"name" => data[:predef_name], "scm" => "#{data[:deps_scm]}",
          "db" => "postgres@postgresql1.megam.com/morning.megam.co", "war" => "#{data[:deps_war]}", "queue" => "queue@queue1", "runtime_exec" => data[:runtime_exec]},
-        "appdefns" => {"timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => ""},
-        "boltdefns" => {"username" => "", "apikey" => "", "store_name" => "", "url" => "", "prime" => "", "timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => ""},
+        "appdefns" => {"timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => "", "env_sh" => ""},
+        "boltdefns" => {"username" => "", "apikey" => "", "store_name" => "", "url" => "", "prime" => "", "timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => "", "env_sh" => ""},
         "appreq" => {},
         "boltreq" => {}
       }
@@ -114,10 +114,10 @@ module Megam
         if data[:deps_war].length > 0
           data[:runtime_exec] = change_runtime(data[:deps_war], data[:runtime_exec], action)
         end
-        node_hash["appdefns"] = {"timetokill" => "#{data[:timetokill]}", "metered" => "#{data[:metered]}", "logging" => "#{data[:logging]}", "runtime_exec" => "#{data[:runtime_exec]}"}
+        node_hash["appdefns"] = {"timetokill" => "#{data[:timetokill]}", "metered" => "#{data[:metered]}", "logging" => "#{data[:logging]}", "runtime_exec" => "#{data[:runtime_exec]}", "env_sh" => "#{data[:env_sh]}"}
       end
       if data[:book_type] == "BOLT"
-        node_hash["boltdefns"] = {"username" => "#{data['user_name']}", "apikey" => "#{data['password']}", "store_name" => "#{data['store_db_name']}", "url" => "#{data['url']}", "prime" => "#{data['prime']}", "timetokill" => "#{data['timetokill']}", "metered" => "#{data['monitoring']}", "logging" => "#{data['logging']}", "runtime_exec" => "#{data['runtime_exec']}" }
+        node_hash["boltdefns"] = {"username" => "#{data['user_name']}", "apikey" => "#{data['password']}", "store_name" => "#{data['store_db_name']}", "url" => "#{data['url']}", "prime" => "#{data['prime']}", "timetokill" => "#{data['timetokill']}", "metered" => "#{data['monitoring']}", "logging" => "#{data['logging']}", "runtime_exec" => "#{data['runtime_exec']}", "env_sh" => "#{data[:env_sh]}" }
       end
       node_hash
     end

data/lib/megam/core/appdefns.rb

@@ -127,6 +127,7 @@ module Megam
       appdefns.appdefns[:metered] = op["metered"] if op && op.has_key?("metered")
       appdefns.appdefns[:logging]= op["logging"] if op && op.has_key?("logging")
       appdefns.appdefns[:runtime_exec] = op["runtime_exec"] if op && op.has_key?("runtime_exec")
+      appdefns.appdefns[:env_sh] = op["env_sh"] if op && op.has_key?("env_sh")
 
       appdefns.some_msg[:code] = o["code"] if o.has_key?("code")
       appdefns.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")

data/lib/megam/core/boltdefns.rb

@@ -152,6 +152,7 @@ module Megam
       boltdefns.boltdefns[:metered] = op["metered"] if op && op.has_key?("metered")
       boltdefns.boltdefns[:logging]= op["logging"] if op && op.has_key?("logging")
       boltdefns.boltdefns[:runtime_exec] = op["runtime_exec"] if op && op.has_key?("runtime_exec")
+      boltdefns.boltdefns[:env_sh] = op["env_sh"] if op && op.has_key?("env_sh")
 
       boltdefns.some_msg[:code] = o["code"] if o.has_key?("code")
       boltdefns.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")

data/lib/megam/core/marketplace_addon.rb

@@ -21,7 +21,7 @@ module Megam
       @node_id = nil
       @node_name = nil
       @marketplace_id = nil
-      @config = {}
+      @config = nil
       @config_id = nil
       @created_at = nil
       @some_msg = {}
@@ -127,7 +127,7 @@ module Megam
         "node_id" => node_id,
         "node_name" => node_name,
         "marketplace_id" => marketplace_id,
-        "config" => config,
+        "config" => {},
         "config_id" => config_id,
         "created_at" => created_at
       }     
@@ -144,7 +144,7 @@ module Megam
       addon.config(o["config"]) if o.has_key?("config")
       addon.config_id(o["config_id"]) if o.has_key?("config_id")
       addon.created_at(o["created_at"]) if o.has_key?("created_at")        
-
+      
       addon.some_msg[:code] = o["code"] if o.has_key?("code")
       addon.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
       addon.some_msg[:msg]= o["msg"] if o.has_key?("msg")

data/lib/megam/core/node.rb

@@ -289,6 +289,7 @@ node.command[:cloudtool][:chef][:name] = oc["cloudtool"]["chef"]["name"]
       node.appdefns[:metered] = op["metered"] if op && op.has_key?("metered")
       node.appdefns[:logging]= op["logging"] if op && op.has_key?("logging")
       node.appdefns[:runtime_exec] = op["runtime_exec"] if op && op.has_key?("runtime_exec")
+      node.appdefns[:env_sh] = op["env_sh"] if op && op.has_key?("env_sh")
 
       #BOLT DEFINITIONS
       op = o["boltdefns"]
@@ -300,6 +301,7 @@ node.command[:cloudtool][:chef][:name] = oc["cloudtool"]["chef"]["name"]
       node.boltdefns[:metered] = op["metered"] if op && op.has_key?("metered")
       node.boltdefns[:logging]= op["logging"] if op && op.has_key?("logging")
       node.boltdefns[:runtime_exec] = op["runtime_exec"] if op && op.has_key?("runtime_exec")
+      node.boltdefns[:env_sh] = op["env_sh"] if op && op.has_key?("env_sh")
 
       #success or error
       node.some_msg[:code] = o["code"] if o.has_key?("code")

data/test/test_appdefns.rb

@@ -1,10 +1,11 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
+=begin  
   def test_post_appdefns
     tmp_hash = {
       "node_name" => "black1.megam.co",
-      "appdefns" => {"timetokill" => "test1", "metered" => "test1", "logging" => "test1", "runtime_exec" => "test"}
+      "appdefns" => {"timetokill" => "test1", "metered" => "test1", "logging" => "test1", "runtime_exec" => "test", "env_sh" => "changed env_sh"}
     }
     response = megams.post_appdefn(tmp_hash)
     assert_equal(201, response.status)
@@ -19,5 +20,16 @@ class TestApps < MiniTest::Unit::TestCase
     response = megams.get_appdefn("asphyxiated1.megam.co","ADF412857952341327872")
     assert_equal(200, response.status)
   end
+=end
+  def test_post_appdefns
+    tmp_hash = {
+      "appdefn_id" => "ADF456016953832636416",
+      "node_name" => "appsample1.megam.co",
+      "runtime_exec" => "test", 
+      "env_sh" => "changed env_sh"
+    }
+    response = megams.update_appdefn(tmp_hash)
+    assert_equal(201, response.status)
+  end
 
 end

data/test/test_boltdefns.rb

@@ -1,12 +1,12 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
-
+=begin
   def test_post_boltdefns
 
    tmp_hash = {
       "node_name" => "black1.megam.co",
-	"boltdefns" => {"username" => "new", "apikey" => "new", "store_name" => "", "url" => "", "prime" => "", "timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => ""}
+	"boltdefns" => {"username" => "new", "apikey" => "new", "store_name" => "", "url" => "", "prime" => "", "timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => "", "env_sh" => "changed env_sh"}
     }
 
     response = megams.post_boltdefn(tmp_hash)
@@ -17,5 +17,16 @@ class TestApps < MiniTest::Unit::TestCase
     response = megams.get_boltdefn("black1.megam.co")
     assert_equal(200, response.status)
   end
+=end
+  def test_post_boltdefns
+    tmp_hash = {
+      "boltdefn_id" => "BDF456048363326930944",
+      "node_name" => "appsample1.megam.co",
+      "runtime_exec" => "test", 
+      "env_sh" => "changed env_sh"
+    }
+    response = megams.update_boltdefn(tmp_hash)
+    assert_equal(201, response.status)
+  end
 
 end

data/test/test_marketplaceaddons.rb

@@ -7,19 +7,23 @@ def test_post_addon
 "disaster"=>{
 "locations"=>"locations",
 "fromhost"=>"appsample1.megam.co",
-"tohosts"=>"appsample2.megam.co;appsample3.megam.co"
+"tohosts"=>"appsample2.megam.co;appsample3.megam.co",
+"recipe"=>"role[drbd]"
 },
 "loadbalancing"=>{
 "haproxyhost"=>"",
-"loadbalancehost"=>""
+"loadbalancehost"=>"",
+"recipe"=>""
 },
 "autoscaling"=>{
 "cputhreshold"=>"",
 "memorythreshold"=>"",
-"noofinstances"=>""
+"noofinstances"=>"",
+"recipe"=>""
 },
 "monitoring"=>{
-"agent"=>"op5"
+"agent"=>"op5",
+"recipe"=>"role[op5]"
 }
 }
 

data/test/test_nodes.rb

@@ -46,8 +46,8 @@ class TestApps < MiniTest::Unit::TestCase
       "command" => @com,
       "predefs" => {"name" => "rails", "scm" => "",
         "db" => "postgres@postgresql1.megam.com/night.megam.co", "war" => "http://s3pub.com/0.1/granny.war", "queue" => "queue@queue1", "runtime_exec" => "sudo start rails"},
-      "appdefns" => {"timetokill" => "0", "metered" => "megam", "logging" => "megam", "runtime_exec" => "start unicorn_<projectname>"},
-      "boltdefns" => {"username" => "", "apikey" => "", "store_name" => "", "url" => "", "prime" => "", "timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => ""},
+      "appdefns" => {"timetokill" => "0", "metered" => "megam", "logging" => "megam", "runtime_exec" => "start unicorn_<projectname>", "env_sh" => "changed env_sh"},
+      "boltdefns" => {"username" => "", "apikey" => "", "store_name" => "", "url" => "", "prime" => "", "timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => "", "env_sh" => "changed env_sh"},
       "appreq" => {},
       "boltreq" => {}
     }
@@ -67,16 +67,19 @@ class TestApps < MiniTest::Unit::TestCase
     assert_equal(201, response.status)
   end
 =end
+=begin
   def test_get_nodes
     response = megams.get_nodes
     assert_equal(200, response.status)
   end
-=begin
+=end  
+#=begin
   def test_get_node0
-    response = megams.get_node("black1.megam.co")
+    response = megams.get_node("appsample1.megam.co")
     assert_equal(200, response.status)
   end
-
+#=end
+=begin
   def test_get_node1
     response = megams.get_node("night.megam.co")
     assert_equal(200, response.status)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.13'
+  version: '0.14'
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -234,3 +234,4 @@ signing_key:
 specification_version: 4
 summary: Ruby Client for the Megam Cloud
 test_files: []
+has_rdoc: