megam_api 0.10 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dcfa506cd9c13c5a5dc800f50a0799931c92bc2
-  data.tar.gz: 07255c089583118b97dcd99c4583dd6d22f3344d
+  metadata.gz: b596f43aff236e1f432583c681e9207d351b9fac
+  data.tar.gz: 2244e795603cb0752b936777810e781edea5011c
 SHA512:
-  metadata.gz: 3121106a5c955d5aaff6b25296116aa883a02d97a66415db939f7cf63b82b4436fb8e33543f1dd12d8c0a3dcdcde61aa6f78857cf52a8526be0d251b012fd23c
-  data.tar.gz: 0567738c16591b74ab9cfa05fd296184d346802221468eaab50999ca4c13487f3cc27708482a6643577ba5d68e23ed29ac83f9aff81c418bc61e0a1e9c638df5
+  metadata.gz: cb6ed13dfb045eb9135737559d1b8e655aef6e2c7ef891ce16f778ccda137dd63d8178d05a4d8a7de4313195786862afbc59dd5ef4c125b369e9b3ae0fa388c3
+  data.tar.gz: 78ed5f63995b668796d052c9be4f0611aea7e1b26a9f513a07da1ef8141626ca497e64caa8aba43062234158bb2416039ce397cb8d392b769286568408a2d550

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.10"
+    VERSION = "0.11"
   end
 end

data/lib/megam/builder/delete_node.rb

@@ -15,11 +15,9 @@
 #
 module Megam
   class DeleteNode < Megam::ServerAPI
-    
-    def initialize(email=nil, api_key=nil)      
+    def initialize(email=nil, api_key=nil)
       super(email, api_key)
     end
-    
 
     def self.create(data, group, action, tmp_email=nil, tmp_api_key=nil)
       delete_command = self.new(tmp_email, tmp_api_key)
@@ -39,21 +37,26 @@ module Megam
         hash = {"msg" => se.message, "msg_type" => "error"}
         re = Megam::Error.from_hash(hash)
       return re
-      end
-    
-      node = node_collection.data[:body].lookup(data[:node_name])      
+      end    
+      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)      
-      cts = cts_collection.data[:body].lookup(data[:repo])      
-      ci_command = "#{cloud_instruction.command}"     
+      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       
+        ci_command["<node_name>"] = "#{data[:node_name]}"
+      end
+      u = URI.parse(node.request[:command]['compute']['access']['vault_location'])
+      u.path[0]=""
+      if ci_command["-f"].present?
+        ci_command["-f"] = "-f " + u.path + "/#{node.request[:command]['compute']['cctype']}.json"
+      end
+
       if ci_command["-c"].present?
-        ci_command["-c"] = "-c #{cts.conf_location}"         
-      end          
-         command_hash = {
+        ci_command["-c"] = "-c #{cts.conf_location}"
+      end
+      command_hash = {
         "systemprovider" => {
           "provider" => {
             "prov" => "#{node.request[:command]['systemprovider']['provider']['prov']}"
@@ -85,7 +88,7 @@ module Megam
             "name" => "-N #{data[:node_name]}"
           }
         }
-      }        
+      }
       node_hash = {
         "node_name" => "#{data[:node_name]}",
         "node_type" => "#{node.node_type}",
@@ -97,7 +100,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.10'
+  version: '0.11'
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Ruby Client for the Megam Cloud