megam_api 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c54e02654f5842a8fe6a9f1db04ed43efa0f946d
-  data.tar.gz: e7e176ae5e5e18b5c3ba256046db5f3d009414eb
+  metadata.gz: 6172ca6dcb996dd9f594003d8b07c2b4336aa53c
+  data.tar.gz: aa3b2084117a559559a46e8f251f1be7fb391677
 SHA512:
-  metadata.gz: eca0464d3a66b7aaab19cb997ff16a98e9f3a032c71da3efa36fe42fd8ff4e3531aa5934c9baf066124e5b3202116e46e93b29c0a0cae143380e149cb01141d1
-  data.tar.gz: 947debff1c449e7d9cd1433d9043983f673a3f7d56d59a7b348ccfaefabbf3456764715d5668c8c152ef0eb3f003ff31e6852d17e2b1eb2e7fbbffdfdcaac7d8
+  metadata.gz: 6d68d890d9a9b4ffbcb35fe45ab3554e95fc4512b6a5e32dc229a7729db563368102531df3895d0b781c5e8a3717744c03f31e2156f5e2907573c2d08397c4d7
+  data.tar.gz: c45bd88b0bdba1933bab2ed46a121e359746e2dc38fedf85148491c3f0a9d13a5150548a1af301b48be996a0af8cfdd83602eba2f0a3c47f7ae9e832bbd1964b

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.7.7"
+    VERSION = "0.7.8"
   end
 end

data/lib/megam/builder/delete_node.rb

@@ -21,12 +21,12 @@ module Megam
     end
     
 
-    def self.create(node_name, group, action, tmp_email, tmp_api_key)
+    def self.create(data, group, action, tmp_email, tmp_api_key)
       delete_command = self.new(tmp_email, tmp_api_key)
       begin
-        node_collection = delete_command.megam_rest.get_node(node_name)
+        node_collection = delete_command.megam_rest.get_node(data[:node_name])
         ct_collection = delete_command.megam_rest.get_cloudtools
-
+        cts_collection = delete_command.megam_rest.get_cloudtoolsettings
       rescue ArgumentError => ae
         hash = {"msg" => ae.message, "msg_type" => "error"}
         re = Megam::Error.from_hash(hash)
@@ -40,13 +40,19 @@ module Megam
         re = Megam::Error.from_hash(hash)
       return re
       end
-
-      node = node_collection.data[:body].lookup(node_name)
+    
+      node = node_collection.data[:body].lookup(data[: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}"
+      cloud_instruction = template.lookup_by_instruction(group, action)      
+      cts = cts_collection.data[:body].lookup(data[:repo])      
+      ci_command = "#{cloud_instruction.command}"     
+      if ci_command["<node_name>"].present?
+      ci_command["<node_name>"] = "#{data[:node_name]}"
+      end  
+      if ci_command["-c"].present?
+        ci_command["-c"] = "-c #{cts.conf_location}"
+      end       
          command_hash = {
         "systemprovider" => {
           "provider" => {
@@ -62,8 +68,10 @@ module Megam
             "tenant_id" =>  "#{node.request[:command]['compute']['tenant_id']}"
           },
           "access" => {
-            "ssh_key" => "#{node.request[:command]['compute']['access']['ssh_key']}",
-            "identity_file" => "#{node.request[:command]['compute']['access']['identity_file']}",
+            #"ssh_key" => "#{node.request[:command]['compute']['access']['ssh_key']}",
+            #"identity_file" => "#{node.request[:command]['compute']['access']['identity_file']}",
+            "ssh_key" => "",
+            "identity_file" => "",
             "ssh_user" => "",
             "vault_location" => "#{node.request[:command]['compute']['access']['vault_location']}",
             "sshpub_location" => "#{node.request[:command]['compute']['access']['sshpub_location']}",
@@ -73,17 +81,16 @@ module Megam
         },
         "cloudtool" => {
           "chef" => {
-            "command" => "#{node.request[:command]['cloudtool']['chef']['prov']}",
+            "command" => "#{node.request[:command]['cloudtool']['chef']['command']}",
             "plugin" => "#{node.request[:command]['compute']['cctype']} #{ci_command}", #ec2 server delete or create
             "run_list" => "",
-            "name" => "-N #{node_name}"
+            "name" => "-N #{data[:node_name]}"
           }
         }
-      }
-
+      }        
       node_hash = {
-        "node_name" => "#{node_name}",
-        "node_type" => "#{node[:node_type]}",
+        "node_name" => "#{data[:node_name]}",
+        "node_type" => "#{node.node_type}",
         "req_type" => "#{action}",
         "noofinstances" => "",
         "command" => command_hash,
@@ -92,7 +99,7 @@ module Megam
         "boltdefns" => {},
         "appreq" => {},
         "boltreq" => {}
-      }
+      }       
       node_hash
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon