megam_api 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61893bc0541b6eae92badc0a4973aa3dffd4f4c4
-  data.tar.gz: 730924c194e9b92611f29232fda2c35b8378741b
+  metadata.gz: 18c65c1b5bad20bae3824e93dc24c97a5e78af5b
+  data.tar.gz: 549d74e7aa3e9c1319c55183409a84ce9417cd87
 SHA512:
-  metadata.gz: 726681779468ca612c7fe69dcd970f2b6a23608998af628c8f2499af62ece774f9c0f78e8f746a97d6727f4c80db9b907df94efa708fa0fed09446f25f6cc9ab
-  data.tar.gz: 5749d4401a773a3ca45bb00d8042ebcf8d41a8075d854fbf491bdd806a977b25eddbe18215efcab3d2ae80585742a3c4af6900793b81334e3b6eb4d4a6ade243
+  metadata.gz: aa1e94ce4b19cad03b9aa4d32caea27ab1607bb71ae3a6ab9b8bc57c170af6761bef0699ae5585e7c2e3c7aef8eb17d5b5d06db0d4caaa53992c906903b9fa3d
+  data.tar.gz: 9a7596daa4428473102a9ee50a1c3b8f25ad1dad16085f662cdb00774cbb5fc13e7b85da1bfd25f6d7761d51e1719d565699e359763461e2b37e2f1f1295cdc9

data/lib/megam/api.rb

@@ -115,6 +115,7 @@ module Megam
     end
 
     def request(params,&block)
+      just_color_debug("#{@options[:path]}")
       start = Time.now
       Megam::Log.debug("START")
       params.each do |pkey, pvalue|
@@ -137,7 +138,7 @@ module Megam
         end
         reerror = klass.new(error.message, error.response)
         reerror.set_backtrace(error.backtrace)
-        Megam::Log.error("#{reerror.response.body}")
+        Megam::Log.debug("#{reerror.response.body}")
         reerror.response.body = Megam::JSONCompat.from_json(reerror.response.body.chomp)
         Megam::Log.debug("RESPONSE ERR: Ruby Object")
         Megam::Log.debug("#{reerror.response.body}")
@@ -177,6 +178,10 @@ module Megam
 
     private
 
+    def just_color_debug(path)
+      text.msg "--> #{text.color("(#{path})", :cyan,:bold)}"
+    end
+
     #Make a lazy connection.
     def connection
       @options[:path] =API_VERSION1+ @options[:path]

data/lib/megam/api/appdefns.rb

@@ -10,6 +10,16 @@ module Megam
         :body     => @options[:body]
       )
     end
+    
+    def get_appdefn(node_name,defn_id)
+      @options = {:path => "/appdefns/#{node_name}/#{defn_id}",:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
 
     def post_appdefn(new_appdefn)
       @options = {:path => '/appdefns/content',

data/lib/megam/api/cloud_tool_settings.rb

@@ -21,7 +21,6 @@ module Megam
     end
 
     def post_cloudtoolsetting(new_cloudtoolsetting)
-    puts "entry"
       @options = {:path => '/cloudtoolsettings/content',
         :body => Megam::JSONCompat.to_json(new_cloudtoolsetting)}.merge(@options)
 

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.7.1"
+    VERSION = "0.7.2"
   end
 end

data/lib/megam/builder/delete_node.rb

@@ -21,72 +21,71 @@ module Megam
     end
 
     def self.create(node_name, group, action)
-    
-       delete_command = self.new()
-     begin
-      node_collection = delete_command.megam_rest.get_node(node_name)
-      ct_collection = delete_command.megam_rest.get_cloudtools
-      
-    rescue ArgumentError => ae
-      hash = {"msg" => ae.message, "msg_type" => "error"}
-      re = Megam::Error.from_hash(hash)
-      return re
-    rescue Megam::API::Errors::ErrorWithResponse => ewr
-      hash = {"msg" => ewr.message, "msg_type" => "error"}
-      re = Megam::Error.from_hash(hash)
-      return re
-    rescue StandardError => se
-      hash = {"msg" => se.message, "msg_type" => "error"}
-      re = Megam::Error.from_hash(hash)
+
+      delete_command = self.new()
+      begin
+        node_collection = delete_command.megam_rest.get_node(node_name)
+        ct_collection = delete_command.megam_rest.get_cloudtools
+
+      rescue ArgumentError => ae
+        hash = {"msg" => ae.message, "msg_type" => "error"}
+        re = Megam::Error.from_hash(hash)
+        return re
+      rescue Megam::API::Errors::ErrorWithResponse => ewr
+        hash = {"msg" => ewr.message, "msg_type" => "error"}
+        re = Megam::Error.from_hash(hash)
+        return re
+      rescue StandardError => se
+        hash = {"msg" => se.message, "msg_type" => "error"}
+        re = Megam::Error.from_hash(hash)
       return re
-    end
-    
-    
-    node = node_collection.data[:body].lookup(node_name)
-tool = ct_collection.data[:body].lookup(node.request[:command]['systemprovider']['provider']['prov'])
-template = tool.cloudtemplates.lookup(node.request[:command]['compute']['cctype'])
-cloud_instruction = template.lookup_by_instruction(group, action)
-ci_command = "#{cloud_instruction.command}"
-ci_command["<node_name>"] = "#{node_name}"
+      end
+
+      node = node_collection.data[:body].lookup(node_name)
+      tool = ct_collection.data[:body].lookup(node.request[:command]['systemprovider']['provider']['prov'])
+      template = tool.cloudtemplates.lookup(node.request[:command]['compute']['cctype'])
+      cloud_instruction = template.lookup_by_instruction(group, action)
+      ci_command = "#{cloud_instruction.command}"
+      ci_command["<node_name>"] = "#{node_name}"
 
-command_hash = {
-"systemprovider" => {
-"provider" => {
-"prov" => "#{node.request[:command]['systemprovider']['provider']['prov']}"
-}
-},
-"compute" => {
-"cctype" => "#{node.request[:command]['compute']['cctype']}",
-"cc" => {
-"groups" => "",
-"image" => "",
-"flavor" => ""
-},
-"access" => {
-"ssh_key" => "#{node.request[:command]['compute']['access']['ssh_key']}",
-"identity_file" => "#{node.request[:command]['compute']['access']['identity_file']}",
-"ssh_user" => "",
-"vault_location" => "#{node.request[:command]['compute']['access']['vault_location']}",
-"sshpub_location" => "#{node.request[:command]['compute']['access']['sshpub_location']}",
-"zone" => "#{node.request[:command]['compute']['access']['zone']}"
-}
-},
-"cloudtool" => {
-"chef" => {
-"command" => "#{node.request[:command]['cloudtool']['chef']['prov']}",
-"plugin" => "#{node.request[:command]['compute']['cctype']} #{ci_command}", #ec2 server delete or create
-"run_list" => "",
-"name" => "-N #{node_name}"
-}
-}
-}
+      command_hash = {
+        "systemprovider" => {
+          "provider" => {
+            "prov" => "#{node.request[:command]['systemprovider']['provider']['prov']}"
+          }
+        },
+        "compute" => {
+          "cctype" => "#{node.request[:command]['compute']['cctype']}",
+          "cc" => {
+            "groups" => "",
+            "image" => "",
+            "flavor" => ""
+          },
+          "access" => {
+            "ssh_key" => "#{node.request[:command]['compute']['access']['ssh_key']}",
+            "identity_file" => "#{node.request[:command]['compute']['access']['identity_file']}",
+            "ssh_user" => "",
+            "vault_location" => "#{node.request[:command]['compute']['access']['vault_location']}",
+            "sshpub_location" => "#{node.request[:command]['compute']['access']['sshpub_location']}",
+            "zone" => "#{node.request[:command]['compute']['access']['zone']}"
+          }
+        },
+        "cloudtool" => {
+          "chef" => {
+            "command" => "#{node.request[:command]['cloudtool']['chef']['prov']}",
+            "plugin" => "#{node.request[:command]['compute']['cctype']} #{ci_command}", #ec2 server delete or create
+            "run_list" => "",
+            "name" => "-N #{node_name}"
+          }
+        }
+      }
 
       node_hash = {
         "node_name" => "#{node_name}",
         "req_type" => "#{action}",
         "command" => command_hash
       }
-node_hash
+      node_hash
     end
   end
 end

data/lib/megam/builder/make_node.rb

@@ -26,6 +26,7 @@ module Megam
       begin
         pc_collection = make_command.megam_rest.get_predefclouds
         ct_collection = make_command.megam_rest.get_cloudtools
+        cts_collection = make_command.megam_rest.get_cloudtoolsettings
 
       rescue ArgumentError => ae
         hash = {"msg" => ae.message, "msg_type" => "error"}
@@ -45,7 +46,9 @@ predef_cloud = pc_collection.data[:body].lookup("#{data[:predef_cloud_name]}")
 tool = ct_collection.data[:body].lookup(data[:provider])
 template = tool.cloudtemplates.lookup(predef_cloud.spec[:type_name])
 cloud_instruction = template.lookup_by_instruction(group, action)
-ci_command = cloud_instruction.command
+cts = cts_collection.data[:body].lookup(data[:repo])
+ci_command = "#{cloud_instruction.command}"
+ci_command["-c"] = "-c #{cts.conf_location}"
 ci_name = cloud_instruction.name
 
       command_hash = {
@@ -59,7 +62,8 @@ ci_name = cloud_instruction.name
           "cc"=> {
             "groups" => "#{predef_cloud.spec[:groups]}",
             "image" => "#{predef_cloud.spec[:image]}",
-            "flavor" => "#{predef_cloud.spec[:flavor]}"
+            "flavor" => "#{predef_cloud.spec[:flavor]}",
+            "tenant_id" => "#{predef_cloud.spec[:tenant_id]}"
           },
           "access" => {
             "ssh_key" => "#{predef_cloud.access[:ssh_key]}",
@@ -67,7 +71,8 @@ ci_name = cloud_instruction.name
             "ssh_user" => "#{predef_cloud.access[:ssh_user]}",
             "vault_location" => "#{predef_cloud.access[:vault_location]}",
             "sshpub_location" => "#{predef_cloud.access[:sshpub_location]}",
-            "zone" => "#{predef_cloud.access[:zone]}"
+            "zone" => "#{predef_cloud.access[:zone]}",
+            "region" => "#{predef_cloud.access[:region]}"
           }
         },
         "cloudtool" => {
@@ -99,8 +104,7 @@ ci_name = cloud_instruction.name
       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']}" }
-      end
-
+      end      
       node_hash
     end
   end

data/lib/megam/core/app_request.rb

@@ -17,13 +17,6 @@ module Megam
   class AppRequest
     # Each notify entry is a resource/action pair, modeled as an
     # Struct with a #resource and #action member
-=begin
-  def self.hash_tree
-    Hash.new do |hash, key|
-      hash[key] = hash_tree
-    end
-  end
-=end
 
     def initialize
       @id = nil

data/lib/megam/core/appdefns.rb

@@ -17,13 +17,6 @@ module Megam
   class Appdefns
     # Each notify entry is a resource/action pair, modeled as an
     # Struct with a #resource and #action member
-=begin
-  def self.hash_tree
-    Hash.new do |hash, key|
-      hash[key] = hash_tree
-    end
-  end
-=end
 
     def initialize
       @id = nil
@@ -33,6 +26,7 @@ module Megam
       @created_at = nil
       @some_msg = {}
     end
+
     def appdefns
       self
     end
@@ -74,7 +68,6 @@ module Megam
       end
     end
 
-
     def created_at(arg=nil)
       if arg != nil
         @created_at = arg
@@ -97,8 +90,6 @@ module Megam
 
     # Transform the ruby obj ->  to a Hash
     def to_hash
-puts "===================> CLASS NAME ====================================="
-puts self.class.name
       index_hash = Hash.new
       index_hash["json_claz"] = self.class.name
       index_hash["id"] = id
@@ -127,25 +118,7 @@ puts self.class.name
       result
     end
 
-    # Create a Megam::Node from NodeResult-JSON
-    #
-    #[{
-    #"id":"NOD362212018897289216",
-    #"accounts_id":"ACT362211962353876992",
-    #"json_claz":"Megam::Node",
-    #"request":{
-    #"req_id":"NOD362212018897289216",
-    #"command":"commands"
-    #},
-    #"predefs":{
-    #"name":"",
-    #"scm":"",
-    #"war":"",
-    #"db":"",
-    #"queue":""
-    #}
-    #}]
-    #
+    
     def self.json_create(o)
       appdefns = new
       appdefns.id(o["id"]) if o.has_key?("id")
@@ -198,10 +171,15 @@ puts self.class.name
       appdefns = self.new()
       appdefns.megam_rest.get_appdefn(node_name)
     end
+    
+    # Load a account by email_p
+    def self.show(node_name, id)
+      appdefns = self.new()
+      appdefns.megam_rest.get_appdefn(node_name,id)
+    end
 
     def to_s
       Megam::Stuff.styled_hash(to_hash)
-    #"---> Megam::Account:[error=#{error?}]\n"+
     end
 
   end

data/lib/megam/core/boltdefns.rb

@@ -19,13 +19,12 @@ module Megam
     # Each notify entry is a resource/action pair, modeled as an
     # Struct with a #resource and #action member
 =begin
-  def self.hash_tree
-    Hash.new do |hash, key|
-      hash[key] = hash_tree
-    end
-  end
+def self.hash_tree
+Hash.new do |hash, key|
+hash[key] = hash_tree
+end
+end
 =end
-
     def initialize
       @id = nil
       @node_id = nil
@@ -34,6 +33,7 @@ module Megam
       @created_at = nil
       @some_msg = {}
     end
+
     def boltdefns
       self
     end
@@ -75,7 +75,6 @@ module Megam
       end
     end
 
-
     def created_at(arg=nil)
       if arg != nil
         @created_at = arg
@@ -152,7 +151,6 @@ module Megam
       boltdefns.node_name(o["node_name"]) if o.has_key?("node_name")
       boltdefns.created_at(o["created_at"]) if o.has_key?("created_at")
 
-
       #APP DEFINITIONS
       op = o["boltdefns"]
       boltdefns.boltdefns[:username] = op["username"] if op && op.has_key?("username")
@@ -199,16 +197,20 @@ module Megam
       megam_rest.post_boltdefn(to_hash)
     end
 
-    # Load a account by email_p
+    # Show all bolt defns by [node_name]/email
     def self.show(node_name)
       boltdefns = self.new()
       boltdefns.megam_rest.get_boltdefn(node_name)
+    end
 
+    # Show a bolt defn by [node_name, defn id] for an email
+    def self.show(node_name,id)
+      boltdefns = self.new()
+      boltdefns.megam_rest.get_boltdefn(node_name,id)
     end
 
     def to_s
       Megam::Stuff.styled_hash(to_hash)
-    #"---> Megam::Account:[error=#{error?}]\n"+
     end
 
   end

data/lib/megam/core/cloudtoolsetting.rb

@@ -1,4 +1,3 @@
-
 # Copyright:: Copyright (c) 2012, 2013 Megam Systems
 # License:: Apache License, Version 2.0
 #
@@ -19,11 +18,13 @@ module Megam
     # Each notify entry is a resource/action pair, modeled as an
     # Struct with a #resource and #action member
     def initialize
-      @id = nil      
+      @id = nil
       @accounts_id = nil
       @cloud_type = nil
+      @repo_name = nil
       @repo = nil
-      @vault_location=nil      
+      @vault_location=nil
+      @conf_location=nil
       @created_at = nil
       @some_msg = {}
     end
@@ -43,7 +44,7 @@ module Megam
       else
       @id
       end
-    end    
+    end
 
     def accounts_id(arg=nil)
       if arg != nil
@@ -61,6 +62,14 @@ module Megam
       end
     end
 
+    def repo_name(arg=nil)
+      if arg != nil
+        @repo_name = arg
+      else
+      @repo_name
+      end
+    end
+
     def repo(arg=nil)
       if arg != nil
         @repo = arg
@@ -75,7 +84,15 @@ module Megam
       else
       @vault_location
       end
-    end    
+    end
+
+    def conf_location(arg=nil)
+      if arg != nil
+        @conf_location= arg
+      else
+      @conf_location
+      end
+    end
 
     def created_at(arg=nil)
       if arg != nil
@@ -101,11 +118,13 @@ module Megam
     def to_hash
       index_hash = Hash.new
       index_hash["json_claz"] = self.class.name
-      index_hash["id"] = id      
+      index_hash["id"] = id
       index_hash["accounts_id"] = accounts_id
       index_hash["cloud_type"] = cloud_type
+      index_hash["repo_name"] = repo_name
       index_hash["repo"] = repo
-      index_hash["vault_location"] = vault_location     
+      index_hash["vault_location"] = vault_location
+      index_hash["conf_location"] = conf_location
       index_hash["created_at"] = created_at
       index_hash["some_msg"] = some_msg
       index_hash
@@ -119,11 +138,13 @@ module Megam
 
     def for_json
       result = {
-        "id" => id,        
+        "id" => id,
         "accounts_id" => accounts_id,
         "cloud_type" => cloud_type,
         "repo" => repo,
-        "vault_location" => vault_location,  
+        "repo_name" => repo_name,
+        "vault_location" => vault_location,
+        "conf_location" => conf_location,
         "created_at" => created_at
       }
       result
@@ -132,12 +153,14 @@ module Megam
     #
     def self.json_create(o)
       cts = new
-      cts.id(o["id"]) if o.has_key?("id")      
+      cts.id(o["id"]) if o.has_key?("id")
       cts.accounts_id(o["accounts_id"]) if o.has_key?("accounts_id")
       cts.cloud_type(o["cloud_type"]) if o.has_key?("cloud_type")
+      cts.repo_name(o["repo_name"]) if o.has_key?("repo_name")
       cts.repo(o["repo"]) if o.has_key?("repo")
-      cts.vault_location(o["vault_location"]) if o.has_key?("vault_location")    
-      
+      cts.vault_location(o["vault_location"]) if o.has_key?("vault_location")
+      cts.conf_location(o["conf_location"]) if o.has_key?("conf_location")
+
       cts.created_at(o["created_at"]) if o.has_key?("created_at")
       #success or error
       cts.some_msg[:code] = o["code"] if o.has_key?("code")
@@ -157,8 +180,10 @@ module Megam
       @id        = o[:id] if o.has_key?(:id)
       @accounts_id = o[:accounts_id] if o.has_key?(:accounts_id)
       @cloud_type   = o[:cloud_type] if o.has_key?(:cloud_type)
+      @repo_name     = o[:repo_name] if o.has_key?(:repo_name)
       @repo     = o[:repo] if o.has_key?(:repo)
-      @vault_location   = o[:vault_location] if o.has_key?(:vault_location)    
+      @vault_location   = o[:vault_location] if o.has_key?(:vault_location)
+      @conf_location   = o[:conf_location] if o.has_key?(:conf_location)
       @created_at   = o[:created_at] if o.has_key?(:created_at)
       self
     end
@@ -177,14 +202,14 @@ module Megam
     # returns a cloudtoolsettingsCollection
     # don't return self. check if the Megam::cloudtoolsettingCollection is returned.
     def self.list
-    cts = self.new()
+      cts = self.new()
       cts.megam_rest.get_cloudtoolsettings
     end
 
     # Show a particular cloudtoolsetting by name,
     # Megam::cloudtoolsetting
     def self.show(p_name)
-    pre = self.new()
+      pre = self.new()
       pre.megam_rest.get_cloudtoolsetting(p_name)
     end
 

data/lib/megam/core/cloudtoolsetting_collection.rb

@@ -35,14 +35,14 @@ module Megam
     def []=(index, arg)
       is_megam_cloudtoolsettings(arg)
       @cloudtoolsettings[index] = arg
-      @cloudtoolsettings_by_name[arg.name] = index
+      @cloudtoolsettings_by_name[arg.repo_name] = index
     end
 
     def <<(*args)
       args.flatten.each do |a|
         is_megam_cloudtoolsettings(a)
         @cloudtoolsettings << a
-        @cloudtoolsettings_by_name[a.name] =@cloudtoolsettings.length - 1
+        @cloudtoolsettings_by_name[a.repo_name] =@cloudtoolsettings.length - 1
       end
       self
     end
@@ -61,11 +61,11 @@ module Megam
         @cloudtoolsettings_by_name.each_key do |key|
         @cloudtoolsettings_by_name[key] += 1 if@cloudtoolsettings_by_name[key] > @insert_after_idx
         end
-        @cloudtoolsettings_by_name[cloudtoolsettings.cloud_type] = @insert_after_idx + 1
+        @cloudtoolsettings_by_name[cloudtoolsettings.repo_name] = @insert_after_idx + 1
         @insert_after_idx += 1
       else
       @cloudtoolsettings << cloudtoolsettings
-      @cloudtoolsettings_by_name[cloudtoolsettings.cloud_type] =@cloudtoolsettings.length - 1
+      @cloudtoolsettings_by_name[cloudtoolsettings.repo_name] =@cloudtoolsettings.length - 1
       end
     end
 
@@ -88,7 +88,7 @@ module Megam
     def lookup(cloudtoolsettings)
       lookup_by = nil
       if cloudtoolsettings.kind_of?(Megam::CloudToolSetting)
-      lookup_by = cloudtoolsettings.cloud_type
+      lookup_by = cloudtoolsettings.repo_name
       elsif cloudtoolsettings.kind_of?(String)
       lookup_by = cloudtoolsettings
       else
@@ -105,7 +105,7 @@ module Megam
     def to_hash
       index_hash = Hash.new
       self.each do |cloudtoolsettings|
-        index_hash[cloudtoolsettings.cloud_type] = cloudtoolsettings.to_s
+        index_hash[cloudtoolsettings.repo_name] = cloudtoolsettings.to_s
       end
       index_hash
     end

data/lib/megam/core/predefcloud.rb

@@ -161,6 +161,7 @@ module Megam
       predefcd.spec[:groups] = oq["groups"] if oq && oq.has_key?("groups")
       predefcd.spec[:image] = oq["image"] if oq && oq.has_key?("image")
       predefcd.spec[:flavor] = oq["flavor"] if oq && oq.has_key?("flavor")
+      predefcd.spec[:tenant_id] = oq["tenant_id"] if oq && oq.has_key?("tenant_id")
       #predef
       op = o["access"]
       predefcd.access[:ssh_key] = op["ssh_key"] if op && op.has_key?("ssh_key")
@@ -169,6 +170,7 @@ module Megam
       predefcd.access[:vault_location]= op["vault_location"] if op && op.has_key?("vault_location")
       predefcd.access[:sshpub_location]= op["sshpub_location"] if op && op.has_key?("sshpub_location")
       predefcd.access[:zone]= op["zone"] if op && op.has_key?("zone")
+      predefcd.access[:region]= op["region"] if op && op.has_key?("region")
       #access
      # predefcd.ideal(o["ideal"]) if o.has_key?("ideal")
      # predefcd.performance(o["performance"]) if o.has_key?("performance")

data/test/test_appdefns.rb

@@ -1,23 +1,23 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
-
   def test_post_appdefns
-
-   tmp_hash = {
+    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"}
     }
-
-puts "======================> POST APPDEFNS TEMP HASH <============================================= "
-puts tmp_hash
     response = megams.post_appdefn(tmp_hash)
     assert_equal(201, response.status)
   end
 
-  def test_get_appdefns
+  def test_get_appdefns_node
     response = megams.get_appdefn("black1.megam.co")
     assert_equal(200, response.status)
   end
 
+  def test_get_appdefns
+    response = megams.get_appdefn("asphyxiated1.megam.co","ADF412857952341327872")
+    assert_equal(200, response.status)
+  end
+
 end

data/test/test_appreqs.rb

@@ -1,10 +1,9 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
-
   def test_post_appreqs
 
-   tmp_hash = {
+    tmp_hash = {
       "req_type" => "NStart",
       "node_name" => "black1.megam.co",
       "appdefns_id" => "12455",
@@ -13,16 +12,14 @@ class TestApps < MiniTest::Unit::TestCase
       "lc_when" => "When"
     }
 
-puts "======================> POST APPREQS TEMP HASH <============================================= "
-puts tmp_hash
     response = megams.post_appreq(tmp_hash)
     assert_equal(201, response.status)
   end
-#=begin
+
   def test_get_appreqs
     response = megams.get_appreq("oceanographer1.megam.co")
     assert_equal(200, response.status)
   end
-#=end
+
 
 end

data/test/test_boltdefns.rb

@@ -9,8 +9,6 @@ class TestApps < MiniTest::Unit::TestCase
 	"boltdefns" => {"username" => "new", "apikey" => "new", "store_name" => "", "url" => "", "prime" => "", "timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => ""}
     }
 
-puts "======================> POST APPDEFNS TEMP HASH <============================================= "
-puts tmp_hash
     response = megams.post_boltdefn(tmp_hash)
     assert_equal(201, response.status)
   end

data/test/test_boltreqs.rb

@@ -13,8 +13,6 @@ class TestApps < MiniTest::Unit::TestCase
       "lc_when" => "When"
     }
 
-puts "======================> POST BOLTREQS TEMP HASH <============================================= "
-puts tmp_hash
     response = megams.post_boltreq(tmp_hash)
     assert_equal(201, response.status)
   end

data/test/test_cloudtoolsettings.rb

@@ -1,20 +1,23 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
-=begin
+#=begin
   def test_post_cloudtoolsetting1
     tmp_hash = { :cloud_type => "chef", 
-                 :repo => "https://github.com"
-                 :vault_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default"  
+                 :repo_name => "test_chef",
+                 :repo => "https://github.com",
+                 :vault_location => "https://s3-ap-southeast-1.amazonaws.com/cloudrecipes/sandy@megamsandbox.com/chef",
+                 :conf_location => "sandy@megamsandbox.com/chef/chef-repo/.chef/knife.rb"  
     }
 
     response = megams.post_cloudtoolsetting(tmp_hash)
     assert_equal(201, response.status)
   end
-=end
+#=end
 =begin
   def test_post_cloudtoolsetting2
-    tmp_hash = { :cloud_type => "chef", 
+    tmp_hash = { :cloud_type => "chef",
+      :repo_name => "test_chef", 
                  :repo => "https://github.com",
                  :vault_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default"  
     }
@@ -22,12 +25,12 @@ class TestApps < MiniTest::Unit::TestCase
     assert_equal(201, response.status)
   end
 =end
-#=begin
+=begin
   def test_get_cloudtoolsettings
     response = megams.get_cloudtoolsettings
     assert_equal(200, response.status)
   end
-#=end
+=end
 =begin
   def test_get_cloudtoolsetting2
     response = megams.get_cloudtoolsetting("rkspce_sundown_play")

data/test/test_nodes.rb

@@ -1,9 +1,8 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
-  #=begin
+  
   def test_post_node1
-
     @com = {
 "systemprovider" => {
 "provider" => {
@@ -15,7 +14,8 @@ class TestApps < MiniTest::Unit::TestCase
 "cc" => {
 "groups" => "megam",
 "image" => "ami-d783cd85",
-"flavor" => "t1.micro"
+"flavor" => "t1.micro",
+"tenant_id" => ""
 },
 "access" => {
 "ssh_key" => "megam_ec2",
@@ -23,13 +23,14 @@ class TestApps < MiniTest::Unit::TestCase
 "ssh_user" => "ubuntu",
 "vault_location" => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
 "sshpub_location" => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
-"zone" => ""
+"zone" => "",
+"region" => "region"
 }
 },
 "cloudtool" => {
 "chef" => {
 "command" => "knife",
-"plugin" => "ec2 server create", #ec2 server delete or create
+"plugin" => "ec2 server create -c sandy@megamsandbox.com/default", #ec2 server delete or create
 "run_list" => "role[opendj]",
 "name" => "-N TestOverAll"
 }
@@ -50,55 +51,41 @@ class TestApps < MiniTest::Unit::TestCase
       "boltreq" => {}
     }
 
-    puts "======================> TEMP HASH <============================================= "
-    puts tmp_hash.class
-    puts tmp_hash
     response = megams.post_node(tmp_hash)
     assert_equal(201, response.status)
   end
 
-  #=end
-#=begin
-def test_post_node2
-tmp_hash = {
-"node_name" => "sundown.megam.co",
-"command" => "commands2",
-"predefs" => {"name" => "rails", "scm" => "https://github.com/awesome.git",
-"db" => "postgres@postgresql2.megam.com/morning.megam.co", "war" => "http://s3pub.com/0.1/orion.war", "queue" => "rabbit@queue1"}
-}
-response = megams.post_node(tmp_hash)
-assert_equal(201, response.status)
-end
-#=end
-def test_get_nodes
-response = megams.get_nodes
-
-    puts "=================> GET NODES Response ========>"
-    puts response.inspect
+  def test_post_node2
+    tmp_hash = {
+      "node_name" => "sundown.megam.co",
+      "command" => "commands2",
+      "predefs" => {"name" => "rails", "scm" => "https://github.com/awesome.git",
+        "db" => "postgres@postgresql2.megam.com/morning.megam.co", "war" => "http://s3pub.com/0.1/orion.war", "queue" => "rabbit@queue1"}
+    }
+    response = megams.post_node(tmp_hash)
+    assert_equal(201, response.status)
+  end
 
-assert_equal(200, response.status)
-end
+  def test_get_nodes
+    response = megams.get_nodes
+    assert_equal(200, response.status)
+  end
 
   def test_get_node0
     response = megams.get_node("black1.megam.co")
-    puts "=================> Response ========>"
-    puts response.inspect
     assert_equal(200, response.status)
   end
 
-  #=end
-=begin
-def test_get_node1
-response = megams.get_node("night.megam.co")
-assert_equal(200, response.status)
-end
+  def test_get_node1
+    response = megams.get_node("night.megam.co")
+    assert_equal(200, response.status)
+  end
 
-def test_get_node_not_found
-assert_raises(Megam::API::Errors::NotFound) do
-megams.get_node("stupid.megam.co")
-end
-end
-=end
+  def test_get_node_not_found
+    assert_raises(Megam::API::Errors::NotFound) do
+      megams.get_node("stupid.megam.co")
+    end
+  end
 
   def test_delete_node1
 
@@ -113,7 +100,8 @@ end
 "cc" => {
 "groups" => "",
 "image" => "",
-"flavor" => ""
+"flavor" => "",
+"tenant_id" => ""
 },
 "access" => {
 "ssh_key" => "megam_ec2",
@@ -121,7 +109,8 @@ end
 "ssh_user" => "",
 "vault_location" => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
 "sshpub_location" => "",
-"zone" => ""
+"zone" => "",
+"region" => "region"
 }
 },
 "cloudtool" => {
@@ -140,12 +129,7 @@ end
       "command" => @com
     }
 
-    puts "======================> TEMP HASH <============================================= "
-    puts tmp_hash.class
-    puts tmp_hash
     response = megams.post_request(tmp_hash)
     assert_equal(201, response.status)
   end
-
-end
-
+end

data/test/test_predefclouds.rb

@@ -7,7 +7,8 @@ class TestApps < MiniTest::Unit::TestCase
         :type_name => "aws-ec2",
         :groups => "megam",
         :image => "ami-d783cd85",
-        :flavor => "m1.medium"
+        :flavor => "m1.medium",
+        :tenant_id => ""
       },
       :access => {
         :ssh_key => "megam_ec2",
@@ -15,7 +16,8 @@ class TestApps < MiniTest::Unit::TestCase
         :ssh_user => "ubuntu",
 	:vault_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
 	:sshpub_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
-	:zone => ""
+	:zone => "",
+	:region => "southeast"
       },
       #:ideal => "ror,redis,riak",
       #:performance => "10rpm"
@@ -30,7 +32,8 @@ class TestApps < MiniTest::Unit::TestCase
         :type_name => "rackspace",
         :groups => "staging_france_boeing",
         :image => "RCP000XERAOl",
-        :flavor => "m1-miniscule"
+        :flavor => "m1-miniscule",
+        :tenant_id => ""
       },
       :access => {
         :ssh_key => "boo_flightssh",
@@ -38,7 +41,8 @@ class TestApps < MiniTest::Unit::TestCase
         :ssh_user => "ubuntu",
 	:vault_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
 	:sshpub_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
-	:zone => ""
+	:zone => "",
+	:region => ""
       },
       #:ideal => "play,redis,riak",
       #:performance => "10rpm"

data/test/test_requests.rb

@@ -1,8 +1,7 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
-
-#=begin
+  #=begin
   def test_get_requests
     response = megams.get_requests
     assert_equal(200, response.status)
@@ -13,15 +12,15 @@ class TestApps < MiniTest::Unit::TestCase
       response = megams.get_request("faulty")
     end
   end
-#=end
+
+  #=end
   def test_get_request_good
     response = megams.get_request("black1.megam.co")
     assert_equal(200, response.status)
   end
 
-
-#=begin
-@com = {
+  #=begin
+  @com = {
 "systemprovider" => {
 "provider" => {
 "prov" => "chef"
@@ -32,7 +31,8 @@ class TestApps < MiniTest::Unit::TestCase
 "cc" => {
 "groups" => "",
 "image" => "",
-"flavor" => ""
+"flavor" => "",
+"tenant_id" => ""
 },
 "access" => {
 "ssh_key" => "megam_ec2",
@@ -40,7 +40,8 @@ class TestApps < MiniTest::Unit::TestCase
 "ssh_user" => "",
 "vault_location" => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
 "sshpub_location" => "",
-"zone" => ""
+"zone" => "",
+"region" => ""
 }
 },
 "cloudtool" => {
@@ -53,23 +54,21 @@ class TestApps < MiniTest::Unit::TestCase
 }
 }
 
-    @@tmp_hash = {
-      "node_name" => "black1.megam.co",
-      "node_type" => "APP", #APP or Bolt
-      "req_type" => "delete",
-      "noofinstances" => 0,
-	"command" => @com,
-      "predefs" => {"name" => "", "scm" => "", "db" => "", "war" => "", "queue" => ""},
-	"appdefns" => {"timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => ""},
-	"boltdefns" => {"username" => "", "apikey" => "", "store_name" => "", "url" => "", "prime" => "", "timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => ""},
-	"appreq" => {},
-	"boltreq" => {}
-    }
+  @@tmp_hash = {
+    "node_name" => "black1.megam.co",
+    "node_type" => "APP", #APP or Bolt
+    "req_type" => "delete",
+    "noofinstances" => 0,
+    "command" => @com,
+    "predefs" => {"name" => "", "scm" => "", "db" => "", "war" => "", "queue" => ""},
+    "appdefns" => {"timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => ""},
+    "boltdefns" => {"username" => "", "apikey" => "", "store_name" => "", "url" => "", "prime" => "", "timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => ""},
+    "appreq" => {},
+    "boltreq" => {}
+  }
 
   def test_request_node_delete
 
-puts "======================> DELETE NODE Request TEMP HASH <============================================= "
-puts @@tmp_hash
     response = megams.post_request(@@tmp_hash)
     assert_equal(201, response.status)
   end
@@ -77,12 +76,9 @@ puts @@tmp_hash
   def test_request_node_stop
     @@tmp_hash["req_type"] = "stop"
     @@tmp_hash["command"]["cloudtool"]["chef"]["plugin"] = "ec2 server stop"
-puts "======================> STOP NODE Request TEMP HASH <============================================= "
-puts @@tmp_hash
-
     response = megams.post_request(@@tmp_hash)
     assert_equal(201, response.status)
   end
 #=end
-  
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon