megam_api 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9757fc9057a94efb7a7aa4ba8ddd78fc70b69fbb
-  data.tar.gz: ee01e1f309ecc0a567fe1c6e86cf6c615e88a09b
+  metadata.gz: bfd6f2f398a4004a3684017e5004213297c55877
+  data.tar.gz: 41c5ec1ce6a41eb96b3453b2129dd10b3f636162
 SHA512:
-  metadata.gz: 9c53373a37b19b2e57673d92e0c0aa908b7ef18bf0b9747c78979c2c7c4d18d9b53e595fe469cf75d5d4445cf6957a32e033cf1817cd81256e768ff0a1c5d7f7
-  data.tar.gz: a7e70f0190b2f3624a4f1769c94e2dc3542f1262d7b47cd18342ff7d59ed99c809ae6cf16c1f8d37f55fe1106093d566995d4af4a85b1837951df543f0302330
+  metadata.gz: 133f5d530b2f7080c0827b948c2171c3889dbe0ff5ff09d8924b4e74cd6b82c80d593b4d5e8486d535fbef6f412146d295002f49f166516e249736595269b979
+  data.tar.gz: 8ed2cced9c93c92420f3b193adddf79ccdadc444764a8bfc8a82d9a0b47c33023435a38f63ca11fc4ea706af934dbf13a2c789cb0d94a044a283cf46e95e315e

data/lib/megam/api.rb

@@ -19,8 +19,8 @@ require "megam/api/login"
 require "megam/api/accounts"
 require "megam/api/nodes"
 require "megam/api/appdefns"
-require "megam/api/appreqs"
-require "megam/api/boltreqs"
+require "megam/api/app_request"
+require "megam/api/bolt_request"
 require "megam/api/boltdefns"
 require "megam/api/requests"
 require "megam/api/predefs"
@@ -35,13 +35,13 @@ require "megam/core/error"
 require "megam/core/account"
 require "megam/core/node"
 require "megam/core/appdefns"
-require "megam/core/appreqs"
-require "megam/core/boltreqs"
+require "megam/core/app_request"
+require "megam/core/bolt_request"
 require "megam/core/boltdefns"
 require "megam/core/node_collection"
 require "megam/core/appdefns_collection"
-require "megam/core/appreqs_collection"
-require "megam/core/boltreqs_collection"
+require "megam/core/app_request_collection"
+require "megam/core/bolt_request_collection"
 require "megam/core/boltdefns_collection"
 require "megam/core/request"
 require "megam/core/request_collection"

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/megam/core/{appreqs.rb → app_request.rb}

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 module Megam
-  class Appreqs
+  class AppRequest
     # Each notify entry is a resource/action pair, modeled as an
     # Struct with a #resource and #action member
 =begin
@@ -34,8 +34,9 @@ module Megam
       @lc_additional = nil
       @lc_when = nil
       @created_at = nil
+      @some_msg = {}
     end
-    def node
+    def appreq
       self
     end
 
@@ -107,6 +108,13 @@ module Megam
       @created_at
       end
     end
+    def some_msg(arg=nil)
+      if arg != nil
+        @some_msg = arg
+      else
+      @some_msg
+      end
+    end
 
     def error?
       crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
@@ -124,6 +132,7 @@ module Megam
       index_hash["lc_additional"] = lc_additional
       index_hash["lc_when"] = lc_when
       index_hash["created_at"] = created_at
+      index_hash["some_msg"] = some_msg
       index_hash
     end
 
@@ -168,23 +177,28 @@ module Megam
     #}]
     #
     def self.json_create(o)
-      node = new
-      node.id(o["id"]) if o.has_key?("id")
-      node.req_type(o["req_type"]) if o.has_key?("req_type")
-      node.appdefns_id(o["appdefns_id"]) if o.has_key?("appdefns_id")
-      node.node_name(o["node_name"]) if o.has_key?("node_name")
-      node.lc_apply(o["lc_apply"]) if o.has_key?("lc_apply")
-      node.lc_additional(o["lc_additional"]) if o.has_key?("lc_additional")
-      node.lc_when(o["lc_when"]) if o.has_key?("lc_when")
-      node.created_at(o["created_at"]) if o.has_key?("created_at")
+      appreq = new
+      appreq.id(o["id"]) if o.has_key?("id")
+      appreq.req_type(o["req_type"]) if o.has_key?("req_type")
+      appreq.appdefns_id(o["appdefns_id"]) if o.has_key?("appdefns_id")
+      appreq.node_name(o["node_name"]) if o.has_key?("node_name")
+      appreq.lc_apply(o["lc_apply"]) if o.has_key?("lc_apply")
+      appreq.lc_additional(o["lc_additional"]) if o.has_key?("lc_additional")
+      appreq.lc_when(o["lc_when"]) if o.has_key?("lc_when")
+      appreq.created_at(o["created_at"]) if o.has_key?("created_at")
+
+      appreq.some_msg[:code] = o["code"] if o.has_key?("code")
+      appreq.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
+      appreq.some_msg[:msg]= o["msg"] if o.has_key?("msg")
+      appreq.some_msg[:links] = o["links"] if o.has_key?("links")
 
-      node
+      appreq
     end
 
     def self.from_hash(o)
-      node = self.new()
-      node.from_hash(o)
-      node
+      appreq = self.new()
+      appreq.from_hash(o)
+      appreq
     end
 
     def from_hash(o)
@@ -206,13 +220,14 @@ module Megam
 
     # Create the node via the REST API
     def create
-      megam_rest.post_node(to_hash)
+      megam_rest.post_appreq(to_hash)
     end
 
     # Load a account by email_p
-    def self.show(node_name)
-      megam_rest.get_node(node_name)
-      self
+    def self.list(node_name)
+      appreq = self.new()
+      appreq.megam_rest.get_appreq(node_name)
+      #self
     end
 
     def to_s

data/lib/megam/core/{appreqs_collection.rb → app_request_collection.rb}

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 module Megam
-  class AppreqsCollection
+  class AppRequestCollection
     include Enumerable
 
     
@@ -88,7 +88,7 @@ module Megam
 
     def lookup(appreq)
       lookup_by = nil
-      if appreq.kind_of?(Megam::Appreqs)
+      if appreq.kind_of?(Megam::AppRequest)
       lookup_by = appreq.id
       elsif appreq.kind_of?(String)
       lookup_by = appreq
@@ -134,7 +134,7 @@ module Megam
     
     
     def is_megam_appreq(arg)
-      unless arg.kind_of?(Megam::Appreqs)
+      unless arg.kind_of?(Megam::AppRequest)
         raise ArgumentError, "Members must be Megam::Appreq's"
       end
       true

data/lib/megam/core/appdefns.rb

@@ -31,8 +31,9 @@ module Megam
       @node_name = nil
       @appdefns ={}
       @created_at = nil
+      @some_msg = {}
     end
-    def node
+    def appdefns
       self
     end
 
@@ -82,6 +83,14 @@ module Megam
       end
     end
 
+    def some_msg(arg=nil)
+      if arg != nil
+        @some_msg = arg
+      else
+      @some_msg
+      end
+    end
+
     def error?
       crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
     end
@@ -97,6 +106,7 @@ puts self.class.name
       index_hash["node_name"] = node_name
       index_hash["appdefns"] = appdefns
       index_hash["created_at"] = created_at
+      index_hash["some_msg"] = some_msg
       index_hash
     end
 
@@ -137,25 +147,31 @@ puts self.class.name
     #}]
     #
     def self.json_create(o)
-      node = new
-      node.id(o["id"]) if o.has_key?("id")
-      node.node_id(o["node_id"]) if o.has_key?("node_id")
-      node.node_name(o["node_name"]) if o.has_key?("node_name")
-      node.created_at(o["created_at"]) if o.has_key?("created_at")
+      appdefns = new
+      appdefns.id(o["id"]) if o.has_key?("id")
+      appdefns.node_id(o["node_id"]) if o.has_key?("node_id")
+      appdefns.node_name(o["node_name"]) if o.has_key?("node_name")
+      appdefns.created_at(o["created_at"]) if o.has_key?("created_at")
 
       #APP DEFINITIONS
       op = o["appdefns"]
-      node.appdefns[:timetokill] = op["timetokill"] if op && op.has_key?("timetokill")
-      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.appdefns[:timetokill] = op["timetokill"] if op && op.has_key?("timetokill")
+      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.some_msg[:code] = o["code"] if o.has_key?("code")
+      appdefns.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
+      appdefns.some_msg[:msg]= o["msg"] if o.has_key?("msg")
+      appdefns.some_msg[:links] = o["links"] if o.has_key?("links")
+
+      appdefns
     end
 
     def self.from_hash(o)
-      node = self.new()
-      node.from_hash(o)
-      node
+      appdefns = self.new()
+      appdefns.from_hash(o)
+      appdefns
     end
 
     def from_hash(o)
@@ -179,8 +195,8 @@ puts self.class.name
 
     # Load a account by email_p
     def self.show(node_name)
-      megam_rest.get_appdefn(node_name)
-      self
+      appdefns = self.new()
+      appdefns.megam_rest.get_appdefn(node_name)
     end
 
     def to_s

data/lib/megam/core/{boltreqs.rb → bolt_request.rb}

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 module Megam
-  class Boltreqs
+  class BoltRequest
     # Each notify entry is a resource/action pair, modeled as an
     # Struct with a #resource and #action member
 =begin
@@ -34,8 +34,9 @@ module Megam
       @lc_additional = nil
       @lc_when = nil
       @created_at = nil
+      @some_msg = {}
     end
-    def node
+    def boltreqs
       self
     end
 
@@ -107,6 +108,14 @@ module Megam
       @created_at
       end
     end
+    def some_msg(arg=nil)
+      if arg != nil
+        @some_msg = arg
+      else
+      @some_msg
+      end
+    end
+
 
     def error?
       crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
@@ -124,6 +133,7 @@ module Megam
       index_hash["lc_additional"] = lc_additional
       index_hash["lc_when"] = lc_when
       index_hash["created_at"] = created_at
+      index_hash["some_msg"] = some_msg
       index_hash
     end
 
@@ -168,23 +178,28 @@ module Megam
     #}]
     #
     def self.json_create(o)
-      node = new
-      node.id(o["id"]) if o.has_key?("id")
-      node.req_type(o["req_type"]) if o.has_key?("req_type")
-      node.boltdefns_id(o["boltdefns_id"]) if o.has_key?("boltdefns_id")
-      node.node_name(o["node_name"]) if o.has_key?("node_name")
-      node.lc_apply(o["lc_apply"]) if o.has_key?("lc_apply")
-      node.lc_additional(o["lc_additional"]) if o.has_key?("lc_additional")
-      node.lc_when(o["lc_when"]) if o.has_key?("lc_when")
-      node.created_at(o["created_at"]) if o.has_key?("created_at")
+      boltreqs = new
+      boltreqs.id(o["id"]) if o.has_key?("id")
+      boltreqs.req_type(o["req_type"]) if o.has_key?("req_type")
+      boltreqs.boltdefns_id(o["boltdefns_id"]) if o.has_key?("boltdefns_id")
+      boltreqs.node_name(o["node_name"]) if o.has_key?("node_name")
+      boltreqs.lc_apply(o["lc_apply"]) if o.has_key?("lc_apply")
+      boltreqs.lc_additional(o["lc_additional"]) if o.has_key?("lc_additional")
+      boltreqs.lc_when(o["lc_when"]) if o.has_key?("lc_when")
+      boltreqs.created_at(o["created_at"]) if o.has_key?("created_at")
+
+      boltreqs.some_msg[:code] = o["code"] if o.has_key?("code")
+      boltreqs.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
+      boltreqs.some_msg[:msg]= o["msg"] if o.has_key?("msg")
+      boltreqs.some_msg[:links] = o["links"] if o.has_key?("links")
 
-      node
+      boltreqs
     end
 
     def self.from_hash(o)
-      node = self.new()
-      node.from_hash(o)
-      node
+      boltreqs = self.new()
+      boltreqs.from_hash(o)
+      boltreqs
     end
 
     def from_hash(o)
@@ -206,13 +221,13 @@ module Megam
 
     # Create the node via the REST API
     def create
-      megam_rest.post_node(to_hash)
+      megam_rest.post_boltreq(to_hash)
     end
 
     # Load a account by email_p
-    def self.show(node_name)
-      megam_rest.get_node(node_name)
-      self
+    def self.list(node_name)
+      boltreq = self.new()
+      boltreq.megam_rest.get_boltreq(node_name)
     end
 
     def to_s

data/lib/megam/core/{boltreqs_collection.rb → bolt_request_collection.rb}

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 module Megam
-  class BoltreqsCollection
+  class BoltRequestCollection
     include Enumerable
 
     
@@ -88,7 +88,7 @@ module Megam
 
     def lookup(boltreq)
       lookup_by = nil
-      if boltreq.kind_of?(Megam::Boltreqs)
+      if boltreq.kind_of?(Megam::BoltRequest)
       lookup_by = boltreq.id
       elsif boltreq.kind_of?(String)
       lookup_by = boltreq
@@ -134,7 +134,7 @@ module Megam
     
     
     def is_megam_boltreq(arg)
-      unless arg.kind_of?(Megam::Boltreqs)
+      unless arg.kind_of?(Megam::BoltRequest)
         raise ArgumentError, "Members must be Megam::Boltreq's"
       end
       true

data/lib/megam/core/boltdefns.rb

@@ -32,8 +32,9 @@ module Megam
       @node_name = nil
       @boltdefns ={}
       @created_at = nil
+      @some_msg = {}
     end
-    def node
+    def boltdefns
       self
     end
 
@@ -83,6 +84,14 @@ module Megam
       end
     end
 
+    def some_msg(arg=nil)
+      if arg != nil
+        @some_msg = arg
+      else
+      @some_msg
+      end
+    end
+
     def error?
       crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
     end
@@ -96,6 +105,7 @@ module Megam
       index_hash["node_name"] = node_name
       index_hash["boltdefns"] = boltdefns
       index_hash["created_at"] = created_at
+      index_hash["some_msg"] = some_msg
       index_hash
     end
 
@@ -136,32 +146,38 @@ module Megam
     #}]
     #
     def self.json_create(o)
-      node = new
-      node.id(o["id"]) if o.has_key?("id")
-      node.node_id(o["node_id"]) if o.has_key?("node_id")
-      node.node_name(o["node_name"]) if o.has_key?("node_name")
-      node.created_at(o["created_at"]) if o.has_key?("created_at")
+      boltdefns = new
+      boltdefns.id(o["id"]) if o.has_key?("id")
+      boltdefns.node_id(o["node_id"]) if o.has_key?("node_id")
+      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"]
-      node.boltdefns[:username] = op["username"] if op && op.has_key?("username")
-      node.boltdefns[:apikey] = op["apikey"] if op && op.has_key?("apikey")
-      node.boltdefns[:store_name]= op["store_name"] if op && op.has_key?("store_name")
-      node.boltdefns[:url] = op["url"] if op && op.has_key?("url")
-      node.boltdefns[:prime] = op["prime"] if op && op.has_key?("prime")
+      boltdefns.boltdefns[:username] = op["username"] if op && op.has_key?("username")
+      boltdefns.boltdefns[:apikey] = op["apikey"] if op && op.has_key?("apikey")
+      boltdefns.boltdefns[:store_name]= op["store_name"] if op && op.has_key?("store_name")
+      boltdefns.boltdefns[:url] = op["url"] if op && op.has_key?("url")
+      boltdefns.boltdefns[:prime] = op["prime"] if op && op.has_key?("prime")
 
-      node.boltdefns[:timetokill] = op["timetokill"] if op && op.has_key?("timetokill")
-      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.boltdefns[:timetokill] = op["timetokill"] if op && op.has_key?("timetokill")
+      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.some_msg[:code] = o["code"] if o.has_key?("code")
+      boltdefns.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
+      boltdefns.some_msg[:msg]= o["msg"] if o.has_key?("msg")
+      boltdefns.some_msg[:links] = o["links"] if o.has_key?("links")
+
+      boltdefns
     end
 
     def self.from_hash(o)
-      node = self.new()
-      node.from_hash(o)
-      node
+      boltdefns = self.new()
+      boltdefns.from_hash(o)
+      boltdefns
     end
 
     def from_hash(o)
@@ -185,8 +201,9 @@ module Megam
 
     # Load a account by email_p
     def self.show(node_name)
-      megam_rest.get_boltdefn(node_name)
-      self
+      boltdefns = self.new()
+      boltdefns.megam_rest.get_boltdefn(node_name)
+
     end
 
     def to_s

data/lib/megam/core/json_compat.rb

@@ -27,13 +27,13 @@ module Megam
     MEGAM_ACCOUNT           = "Megam::Account".freeze
     MEGAM_NODE              = "Megam::Node".freeze
     MEGAM_APPDEFNS          = "Megam::AppDefns".freeze
-    MEGAM_APPREQS          = "Megam::AppRequest".freeze
-    MEGAM_BOLTREQS          = "Megam::BoltRequest".freeze
+    MEGAM_APPREQUEST          = "Megam::AppRequest".freeze
+    MEGAM_BOLTREQUEST          = "Megam::BoltRequest".freeze
     MEGAM_BOLTDEFNS         = "Megam::BoltDefns".freeze
     MEGAM_NODECOLLECTION    = "Megam::NodeCollection".freeze
     MEGAM_APPDEFNSCOLLECTION    = "Megam::AppDefnCollection".freeze
-    MEGAM_APPREQSCOLLECTION    = "Megam::AppRequestCollection".freeze
-    MEGAM_BOLTREQSCOLLECTION    = "Megam::BoltRequestCollection".freeze
+    MEGAM_APPREQUESTCOLLECTION    = "Megam::AppRequestCollection".freeze
+    MEGAM_BOLTREQUESTCOLLECTION    = "Megam::BoltRequestCollection".freeze
     MEGAM_BOLTDEFNSCOLLECTION    = "Megam::BoltDefnCollection".freeze
     MEGAM_REQUEST            = "Megam::Request".freeze
     MEGAM_REQUESTCOLLECTION  = "Megam::RequestCollection".freeze
@@ -131,20 +131,20 @@ module Megam
           Megam::Node
         when MEGAM_APPDEFNS
           Megam::Appdefns
-        when MEGAM_APPREQS
-          Megam::Appreqs
-        when MEGAM_BOLTREQS
-          Megam::Boltreqs
+        when MEGAM_APPREQUEST
+          Megam::AppRequest
+        when MEGAM_BOLTREQUEST
+          Megam::BoltRequest
         when MEGAM_BOLTDEFNS
           Megam::Boltdefns
         when MEGAM_NODECOLLECTION
           Megam::NodeCollection
         when MEGAM_APPDEFNSCOLLECTION
           Megam::AppdefnsCollection
-        when MEGAM_APPREQSCOLLECTION
-          Megam::AppreqsCollection
-        when MEGAM_BOLTREQSCOLLECTION
-          Megam::BoltreqsCollection
+        when MEGAM_APPREQUESTCOLLECTION
+          Megam::AppRequestCollection
+        when MEGAM_BOLTREQUESTCOLLECTION
+          Megam::BoltRequestCollection
         when MEGAM_BOLTDEFNSCOLLECTION
           Megam::BoltdefnsCollection
         when MEGAM_REQUEST

data/lib/megam/core/node.rb

@@ -39,6 +39,8 @@ module Megam
       @some_msg = {}
       #@command = self.class.hash_tree
 	@command = Hashie::Mash.new
+	@appdefnsid = nil
+	@boltdefnsid = nil
 	@appdefns = {}
 	@boltdefns = {}
       @created_at = nil
@@ -147,6 +149,21 @@ module Megam
       @boltdefns
       end
     end
+    def appdefnsid(arg=nil)
+      if arg != nil
+        @appdefnsid = arg
+      else
+      @appdefnsid
+      end
+    end
+
+    def boltdefnsid(arg=nil)
+      if arg != nil
+        @boltdefnsid = arg
+      else
+      @boltdefnsid
+      end
+    end
 
     def created_at(arg=nil)
       if arg != nil
@@ -185,6 +202,8 @@ module Megam
       index_hash["boltdefns"] = boltdefns
       index_hash["some_msg"] = some_msg
       index_hash["noofinstances"] = noofinstances.to_i
+      index_hash["appdefnsid"] = appdefnsid
+      index_hash["boltdefnsid"] = boltdefnsid
       index_hash["created_at"] = created_at
       index_hash
     end
@@ -207,6 +226,8 @@ module Megam
         "predefs" => predefs,
         "appdefns" => appdefns,
         "boltdefns" => boltdefns,
+        "appdefnsid" => appdefnsid,
+        "boltdefnsid" => boltdefnsid,
         "noofinstances" => noofinstances,
         "created_at" => created_at
       }
@@ -240,6 +261,8 @@ module Megam
       node.node_type(o["node_type"]) if o.has_key?("node_type")
       node.req_type(o["req_type"]) if o.has_key?("req_type")
       node.status(o["status"]) if o.has_key?("status")
+      node.appdefnsid(o["appdefnsid"]) if o.has_key?("appdefnsid")
+      node.boltdefnsid(o["boltdefnsid"]) if o.has_key?("boltdefnsid")
       node.noofinstances(o["noofinstances"]) if o.has_key?("noofinstances")
       node.created_at(o["created_at"]) if o.has_key?("created_at")
       #requests
@@ -249,8 +272,6 @@ module Megam
       node.request[:command] = oq["command"] if oq && oq.has_key?("command")
 
       #Command
-      oc = o["command"]
-	node.command = node.command(oc) if oc && oc.has_key?("systemprovider")
 =begin
 	node.command[:systemprovider][:provider][:prov] = oc["systemprovider"]["provider"]["prov"]
 	node.command[:compute][:cctype] = oc["compute"]["cctype"]
@@ -317,6 +338,8 @@ module Megam
       @predefs   = o["predefs"] if o.has_key?("predefs")
       @appdefns   = o["appdefns"] if o.has_key?("appdefns")
       @boltdefns   = o["boltdefns"] if o.has_key?("boltdefns")
+      @appdefnsid   = o["appdefnsid"] if o.has_key?("appdefnsid")
+      @boltdefnsid   = o["boltdefnsid"] if o.has_key?("boltdefnsid")
       @noofinstances        = o["noofinstances"] if o.has_key?("noofinstances")
       @created_at        = o["created_at"] if o.has_key?("created_at")
       self

data/lib/megam/core/predefcloud.rb

@@ -165,6 +165,7 @@ module Megam
       predefcd.access[:ssh_key] = op["ssh_key"] if op && op.has_key?("ssh_key")
       predefcd.access[:identity_file] = op["identity_file"] if op && op.has_key?("identity_file")
       predefcd.access[:ssh_user]= op["ssh_user"] if op && op.has_key?("ssh_user")
+      predefcd.access[:vault_location]= op["vault_location"] if op && op.has_key?("vault_location")
       #access
      # predefcd.ideal(o["ideal"]) if o.has_key?("ideal")
      # predefcd.performance(o["performance"]) if o.has_key?("performance")
@@ -217,7 +218,6 @@ module Megam
     def self.show(p_name)
 	pre = self.new()
       pre.megam_rest.get_predefcloud(p_name)
-      self
     end
 
     def to_s

data/lib/megam/core/request.rb

@@ -168,12 +168,12 @@ module Megam
     end
 
     
-     def self.list
+     def self.show
       prede = self.new()
       prede.megam_rest.get_requests
     end
 
-     def self.show(n_name)
+     def self.list(n_name)
       prede = self.new()
       prede.megam_rest.get_request(n_name)
     end

data/test/test_appreqs.rb

@@ -20,7 +20,7 @@ puts tmp_hash
   end
 #=begin
   def test_get_appreqs
-    response = megams.get_appreq("black1.megam.co")
+    response = megams.get_appreq("oceanographer1.megam.co")
     assert_equal(200, response.status)
   end
 #=end

data/test/test_nodes.rb

@@ -20,7 +20,8 @@ class TestApps < MiniTest::Unit::TestCase
 "access" => {
 "ssh_key" => "megam_ec2",
 "identity_file" => "~/.ssh/megam_ec2.pem",
-"ssh_user" => "ubuntu"
+"ssh_user" => "ubuntu",
+"vault_location" => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default"
 }
 },
 "cloudtool" => {
@@ -39,7 +40,7 @@ class TestApps < MiniTest::Unit::TestCase
       "req_type" => "create", #CREATE OR DELETE
       "noofinstances" => 2, # integer
       "command" => @com,
-      "predefs" => {"name" => "rails", "scm" => "https://github.com/temp.git",
+      "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" => "runtime_execTOM"},
       "boltdefns" => {"username" => "tom", "apikey" => "123456", "store_name" => "tom_db", "url" => "", "prime" => "", "timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => ""},
@@ -55,7 +56,7 @@ class TestApps < MiniTest::Unit::TestCase
   end
 
   #=end
-=begin
+#=begin
 def test_post_node2
 tmp_hash = {
 "node_name" => "sundown.megam.co",
@@ -66,7 +67,7 @@ tmp_hash = {
 response = megams.post_node(tmp_hash)
 assert_equal(201, response.status)
 end
-=end
+#=end
 def test_get_nodes
 response = megams.get_nodes
 
@@ -115,7 +116,8 @@ end
 "access" => {
 "ssh_key" => "megam_ec2",
 "identity_file" => "~/.ssh/megam_ec2.pem",
-"ssh_user" => ""
+"ssh_user" => "",
+"vault_location" => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default"
 }
 },
 "cloudtool" => {

data/test/test_predefclouds.rb

@@ -1,7 +1,7 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
-  #=begin
+#=begin
   def test_post_predefcloud1
     tmp_hash = { :name => "aws_ec2_predef_medium", :spec => {
         :type_name => "aws-ec2",
@@ -12,7 +12,8 @@ class TestApps < MiniTest::Unit::TestCase
       :access => {
         :ssh_key => "megam_ec2",
         :identity_file => "~/.ssh/megam_ec2.pem",
-        :ssh_user => "ubuntu"
+        :ssh_user => "ubuntu",
+	:vault_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default"
       },
       :ideal => "ror,redis,riak",
       :performance => "10rpm"
@@ -21,7 +22,7 @@ class TestApps < MiniTest::Unit::TestCase
     response = megams.post_predefcloud(tmp_hash)
     assert_equal(201, response.status)
   end
-
+#=end
   def test_post_predefcloud2
     tmp_hash = { :name => "rkspce_sundown_play", :spec => {
         :type_name => "rackspace",
@@ -32,7 +33,8 @@ class TestApps < MiniTest::Unit::TestCase
       :access => {
         :ssh_key => "boo_flightssh",
         :identity_file => "https://boering.dropbox.closedloc/aorc.pem",
-        :ssh_user => "ubuntu"
+        :ssh_user => "ubuntu",
+	:vault_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default"
       },
       :ideal => "play,redis,riak",
       :performance => "10rpm"
@@ -41,27 +43,28 @@ class TestApps < MiniTest::Unit::TestCase
     assert_equal(201, response.status)
   end
 
-  #=end
+#=begin
   def test_get_predefclouds
     response = megams.get_predefclouds
     assert_equal(200, response.status)
   end
+#=end
 
   def test_get_predefcloud2
-    response = megams.get_predefcloud("iaas_default")
+    response = megams.get_predefcloud("rkspce_sundown_play")
     assert_equal(200, response.status)
   end
-
+#=begin
   def test_get_predefcloud1
     response = megams.get_predefcloud("iaas_default")
     assert_equal(200, response.status)
   end
-=begin
+
 def test_get_predefcloud_not_found
 assert_raises(Megam::API::Errors::NotFound) do
 megams.get_predefcloud("stupid.megam.co")
 end
 end
-=end
+#=end
 end
 

data/test/test_requests.rb

@@ -2,7 +2,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,14 +13,14 @@ class TestApps < MiniTest::Unit::TestCase
       response = megams.get_request("faulty")
     end
   end
-
+#=end
   def test_get_request_good
-    response = megams.get_request("morning.megam.co")
+    response = megams.get_request("black1.megam.co")
     assert_equal(200, response.status)
   end
-=end
 
 
+#=begin
 @com = {
 "systemprovider" => {
 "provider" => {
@@ -37,7 +37,8 @@ class TestApps < MiniTest::Unit::TestCase
 "access" => {
 "ssh_key" => "megam_ec2",
 "identity_file" => "~/.ssh/megam_ec2.pem",
-"ssh_user" => ""
+"ssh_user" => "",
+"vault_location" => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default"
 }
 },
 "cloudtool" => {
@@ -80,6 +81,6 @@ 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.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -127,10 +127,10 @@ files:
 - lib/certs/cacert.pem
 - lib/megam/api.rb
 - lib/megam/api/accounts.rb
+- lib/megam/api/app_request.rb
 - lib/megam/api/appdefns.rb
-- lib/megam/api/appreqs.rb
+- lib/megam/api/bolt_request.rb
 - lib/megam/api/boltdefns.rb
-- lib/megam/api/boltreqs.rb
 - lib/megam/api/cloud_tools.rb
 - lib/megam/api/errors.rb
 - lib/megam/api/login.rb
@@ -141,15 +141,15 @@ files:
 - lib/megam/api/requests.rb
 - lib/megam/api/version.rb
 - lib/megam/core/account.rb
+- lib/megam/core/app_request.rb
+- lib/megam/core/app_request_collection.rb
 - lib/megam/core/appdefns.rb
 - lib/megam/core/appdefns_collection.rb
-- lib/megam/core/appreqs.rb
-- lib/megam/core/appreqs_collection.rb
 - lib/megam/core/auth.rb
+- lib/megam/core/bolt_request.rb
+- lib/megam/core/bolt_request_collection.rb
 - lib/megam/core/boltdefns.rb
 - lib/megam/core/boltdefns_collection.rb
-- lib/megam/core/boltreqs.rb
-- lib/megam/core/boltreqs_collection.rb
 - lib/megam/core/cloudinstruction.rb
 - lib/megam/core/cloudinstruction_collection.rb
 - lib/megam/core/cloudinstruction_group.rb