megam_api 0.47 → 0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a839f88d93e8ac8b41192469ebc836c8941991cf
-  data.tar.gz: 550a304c234180b30b3df2f73fe9280535151dac
+  metadata.gz: 29b0f91925f8e19dfecd89a26036ae8cd61cbe58
+  data.tar.gz: 299771d843954f270fe2e8687555caf668a46a27
 SHA512:
-  metadata.gz: cc465053c9bb085a926d96deab557b0e91ed6c279a122b9100bded1b3e09272dfae3797735f6d2cbeb7bf47df7e7260087f46db3b7da084802024d6aa3892c77
-  data.tar.gz: 9e74ca42c0dc2f66c3d5ef51617b213d6cf85be993ce18ecfc89cc518af73853e29badace307b1ba353b0e714e5d0587fe3f269db5eac53dbd330ebb8f7bd368
+  metadata.gz: fb4a60d63ba3dd2e04f48f2972dd391c0a3eaa44d5b5b6a3d8243ed7c89e8be4ea81dd4c055a0f80c37a0d61446dda539dfd3dbbb59036ab8d87d4c1a3f5b421
+  data.tar.gz: 8251a9b21b9cebf7b859d9a49ea22d6473fccdcacd241ead52acf9b1bfc044502451f9414553df4464c692204b72ea900af4f43b19813ccd6c944e6f11f2f774

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.47"
+    VERSION = "0.48"
   end
 end

data/lib/megam/core/assemblies.rb

@@ -21,10 +21,7 @@ module Megam
       @accounts_id = nil
       @name = nil
       @assemblies = []
-      @assemblies_type = []
-      @inputs = {}
-      @label = nil
-      @cloudsettings = []
+      @inputs = []
       @created_at = nil
       super(email, api_key)
     end
@@ -124,12 +121,7 @@ module Megam
       asm.name(o["name"]) if o.has_key?("name")
       asm.accounts_id(o["accounts_id"]) if o.has_key?("accounts_id")
       asm.assemblies(o["assemblies"]) if o.has_key?("assemblies") #this will be an array? can hash store array?
-
-      oq = o["inputs"]    
-      asm.inputs[:id] = oq["id"] if oq && oq.has_key?("id")
-      asm.inputs[:assemblies_type] = oq["assemblies_type"] if oq && oq.has_key?("assemblies_type")
-      asm.inputs[:label] = oq["label"] if oq && oq.has_key?("label")
-      asm.inputs[:cloudsettings] = oq["cloudsettings"] if oq && oq.has_key?("cloudsettings")
+      asm.inputs(o["inputs"]) if o.has_key?("inputs")     
       asm.created_at(o["created_at"]) if o.has_key?("created_at")
       asm
     end
@@ -146,13 +138,12 @@ module Megam
       @accounts_id       = o["accounts_id"] if o.has_key?("accounts_id")
       @assemblies        = o["assemblies"] if o.has_key?("assemblies")
       @inputs             = o["inputs"] if o.has_key?("inputs")
-      @label             = o["label"] if o.has_key?("label")
       @created_at        = o["created_at"] if o.has_key?("created_at")
       self
     end
 
-    def self.create(o,tmp_email=nil, tmp_api_key=nil)
-      asm = from_hash(o, tmp_email, tmp_api_key)
+    def self.create(params)
+      asm = from_hash(params, params["email"] || params[:email], params["api_key"] || params[:api_key])
       asm.create
     end
 

data/lib/megam/core/assembly.rb

@@ -21,9 +21,10 @@ module Megam
       @name = nil
       @tosca_type = nil
       @components = []
+      @requirements = []
       @policies=[]
       @inputs = []
-      @operations = nil
+      @operations = []
       @outputs = []
       @status = nil
       @created_at = nil
@@ -65,6 +66,14 @@ module Megam
       @components
       end
     end
+    
+    def requirements(arg=[])
+      if arg != []
+        @requirements = arg
+      else
+      @requirements
+      end
+    end
 
     def policies(arg=[])
       if arg != []
@@ -126,6 +135,7 @@ module Megam
       index_hash["name"] = name
       index_hash["tosca_type"] = tosca_type
       index_hash["components"] = components
+      index_hash["requirements"] = requirements
       index_hash["policies"] = policies
       index_hash["inputs"] = inputs
       index_hash["operations"] = operations
@@ -147,6 +157,7 @@ module Megam
         "name" => name,
         "tosca_type" => tosca_type,
         "components" => components,
+        "requirements" => requirements,
         "policies" => policies,
         "inputs" => inputs,
         "operations" => operations,
@@ -164,6 +175,7 @@ module Megam
       asm.name(o["name"]) if o.has_key?("name")
       asm.tosca_type(o["tosca_type"]) if o.has_key?("tosca_type")
       asm.components(o["components"]) if o.has_key?("components")
+      asm.requirements(o["requirements"]) if o.has_key?("requirements")
       asm.policies(o["policies"]) if o.has_key?("policies") #this will be an array? can hash store array?
       asm.inputs(o["inputs"]) if o.has_key?("inputs")
       asm.operations(o["operations"]) if o.has_key?("operations")
@@ -184,6 +196,7 @@ module Megam
       @name              = o["name"] if o.has_key?("name")
       @tosca_type        = o["tosca_type"] if o.has_key?("tosca_type")
       @components        = o["components"] if o.has_key?("components")
+      @requirements      = o["requirements"] if o.has_key?("requirements")
       @policies          = o["policies"] if o.has_key?("policies")
       @inputs            = o["inputs"] if o.has_key?("inputs")
       @operations        = o["operations"] if o.has_key?("operations")
@@ -194,13 +207,13 @@ module Megam
     end
 
 
-    def self.show(assembly_id, tmp_email=nil, tmp_api_key=nil)
-      asm = self.new(tmp_email, tmp_api_key)
-      asm.megam_rest.get_one_assembly(assembly_id)
+    def self.show(params)
+      asm = self.new(params["email"], params["api_key"])
+      asm.megam_rest.get_one_assembly(params["id"])
     end
 
-     def self.update(o,tmp_email=nil, tmp_api_key=nil)
-      asm = from_hash(o, tmp_email, tmp_api_key)
+     def self.update(params)
+      asm = from_hash(params, params["email"], params["api_key"])
       asm.update
     end
 

data/lib/megam/core/components.rb

@@ -20,35 +20,15 @@ module Megam
       @id = nil
       @name =nil
       @tosca_type = nil
-      @requirements = {}
-      @host = nil
-      @dummy = nil
-      @inputs = {}
-      @domain = nil
-      @port = nil
-      @username = nil
-      @password = nil
-      @version = nil
-      @source = nil
-      @design_inputs = nil
-      @x = nil
-      @y = nil
-      @z = nil
-      @wires = []
-      @service_inputs = nil
-      @ci_id = nil
-      @dbname = nil
-      @dbpassword = nil
-      @external_management_resource = nil
+      @inputs = []
+      @outputs = []      
       @artifacts = {}
       @artifact_type = nil
       @content = nil
-      @artifact_requirements = nil
+      @artifact_requirements = []
       @related_components = nil
-      @operations = {}
-      @operation_type = nil
-      @target_resource = nil
-      @others = []
+      @operations = []
+      @status = nil
       @created_at = nil
 
       super(email, api_key)
@@ -81,31 +61,7 @@ module Megam
       @tosca_type
       end
     end
-
-    def requirements(arg=nil)
-      if arg != nil
-        @requirements = arg
-      else
-      @requirements
-      end
-    end
-
-    def host(arg=nil)
-      if arg != nil
-        @host = arg
-      else
-      @host
-      end
-    end
-
-    def dummy(arg=nil)
-      if arg != nil
-        @dummy = arg
-      else
-      @dummy
-      end
-    end
-
+    
     def inputs(arg=[])
       if arg != []
         @inputs = arg
@@ -113,132 +69,12 @@ module Megam
       @inputs
       end
     end
-
-    def domain(arg=nil)
-      if arg != nil
-        @domain = arg
-      else
-      @domain
-      end
-    end
-
-    def port(arg=nil)
-      if arg != nil
-        @port = arg
-      else
-      @port
-      end
-    end
-
-    def username(arg=nil)
-      if arg != nil
-        @username = arg
-      else
-      @username
-      end
-    end
-
-    def password(arg=nil)
-      if arg != nil
-        @password = arg
-      else
-      @password
-      end
-    end
-
-    def version(arg=nil)
-      if arg != nil
-        @version = arg
-      else
-      @version
-      end
-    end
-
-    def source(arg=nil)
-      if arg != nil
-        @source = arg
-      else
-      @source
-      end
-    end
-
-    def design_inputs(arg=nil)
-      if arg != nil
-        @design_inputs = arg
-      else
-      @design_inputs
-      end
-    end
-
-    def x(arg=nil)
-      if arg != nil
-        @x = arg
-      else
-      @x
-      end
-    end
-
-    def y(arg=nil)
-      if arg != nil
-        @y = arg
-      else
-      @y
-      end
-    end
-
-    def z(arg=nil)
-      if arg != nil
-        @z = arg
-      else
-      @z
-      end
-    end
-
-    def wires(arg=nil)
-      if arg != nil
-        @wires = arg
-      else
-      @wires
-      end
-    end
-
-    def service_inputs(arg=nil)
-      if arg != nil
-        @service_inputs = arg
-      else
-      @service_inputs
-      end
-    end
     
-     def ci_id(arg=nil)
-      if arg != nil
-        @ci_id = arg
-      else
-      @ci_id
-      end
-    end
-
-    def dbname(arg=nil)
-      if arg != nil
-        @dbname = arg
-      else
-      @dbname
-      end
-    end
-
-    def dbpassword(arg=nil)
-      if arg != nil
-        @dbpassword = arg
-      else
-      @dbpassword
-      end
-    end
-
-    def external_management_resource(arg=nil)
-      if arg != nil
-        @external_management_resource = arg
+    def outputs(arg=[])
+      if arg != []
+        @outputs = arg
       else
-      @external_management_resource
+      @outputs
       end
     end
 
@@ -266,8 +102,8 @@ module Megam
       end
     end
 
-    def artifact_requirements(arg=nil)
-      if arg != nil
+    def artifact_requirements(arg=[])
+      if arg != []
         @artifact_requirements = arg
       else
       @artifact_requirements
@@ -282,35 +118,19 @@ module Megam
       end
     end
 
-    def operations(arg=nil)
-      if arg != nil
+    def operations(arg=[])
+      if arg != []
         @operations = arg
       else
       @operations
       end
     end
-
-    def operation_type(arg=nil)
-      if arg != nil
-        @operation_type = arg
-      else
-      @operation_type
-      end
-    end
-
-    def target_resource(arg=nil)
-      if arg != nil
-        @target_resource = arg
-      else
-      @target_resource
-      end
-    end
     
-     def others(arg=nil)
+     def status(arg=nil)
       if arg != nil
-        @others = arg
+        @status = arg
       else
-      @others
+      @status
       end
     end
 
@@ -333,13 +153,12 @@ module Megam
       index_hash["id"] = id
       index_hash["name"] = name
       index_hash["tosca_type"] = tosca_type
-      index_hash["requirements"] = requirements
       index_hash["inputs"] = inputs
-      index_hash["external_management_resource"] = external_management_resource
+      index_hash["outputs"] = outputs
       index_hash["artifacts"] = artifacts
       index_hash["related_components"] = related_components
       index_hash["operations"] = operations
-      index_hash["others"] = others
+      index_hash["status"] = status
       index_hash["created_at"] = created_at
       index_hash
     end
@@ -355,13 +174,12 @@ module Megam
         "id" => id,
         "name" => name,
         "tosca_type" => tosca_type,
-        "requirements" => requirements,
         "inputs" => inputs,
-        "external_management_resource" => external_management_resource,
+        "outputs" => outputs,
         "artifacts" => artifacts,
         "related_components" => related_components,
         "operations" => operations,
-        "others" => others,
+        "status" => status,
         "created_at" => created_at
       }
       result
@@ -372,32 +190,8 @@ module Megam
       asm.id(o["id"]) if o.has_key?("id")
       asm.name(o["name"]) if o.has_key?("name")
       asm.tosca_type(o["tosca_type"]) if o.has_key?("tosca_type")
-
-      oq = o["requirements"]
-      asm.requirements[:host] = oq["host"] if oq && oq.has_key?("host")
-      asm.requirements[:dummy] = oq["dummy"] if oq && oq.has_key?("dummy")
-
-      inp = o["inputs"]
-      asm.inputs[:domain] = inp["domain"] if inp && inp.has_key?("domain")
-      asm.inputs[:port] = inp["port"] if inp && inp.has_key?("port")
-      asm.inputs[:username] = inp["username"] if inp && inp.has_key?("username")
-      asm.inputs[:password] = inp["password"] if inp && inp.has_key?("password")
-      asm.inputs[:version] = inp["version"] if inp && inp.has_key?("version")
-      asm.inputs[:source] = inp["source"] if inp && inp.has_key?("source")
-      asm.inputs[:design_inputs] = inp["design_inputs"] if inp && inp.has_key?("design_inputs")
-      asm.inputs[:service_inputs] = inp["service_inputs"] if inp && inp.has_key?("service_inputs")
-      asm.inputs[:ci_id] = inp["ci_id"] if inp && inp.has_key?("ci_id")
-      # ind = inp["design_inputs"]
-      #  asm.inputs["design_inputs"][:did] = ind["did"] if ind && ind.has_key?("did")
-      # asm.inputs[:design_inputs][:x] = ind["x"] if ind && ind.has_key?("x")
-      # asm.inputs[:design_inputs][:y] = ind["y"] if ind && ind.has_key?("y")
-      #  asm.inputs[:design_inputs][:z] = ind["z"] if ind && ind.has_key?("z")
-      #  asm.inputs[:design_inputs][:wires] = ind["wires"] if ind && ind.has_key?("wires")
-      #  ins = o["inputs"]["service_inputs"]
-      #  asm.inputs[:service_inputs][:dbname] = ins["dbname"] if ins && ins.has_key?("dbname")
-      # asm.inputs[:service_inputs][:dbpassword] = ins["dbpassword"] if ins && ins.has_key?("dbpassword")
-
-      asm.external_management_resource(o["external_management_resource"]) if o.has_key?("external_management_resource")
+      asm.inputs(o["inputs"]) if o.has_key?("inputs")
+      asm.outputs(o["outputs"]) if o.has_key?("outputs")
 
       ar = o["artifacts"]
       asm.artifacts[:artifact_type] = ar["artifact_type"] if ar && ar.has_key?("artifact_type")
@@ -405,12 +199,8 @@ module Megam
       asm.artifacts[:artifact_requirements] = ar["artifact_requirements"] if ar && ar.has_key?("artifact_requirements")
 
       asm.related_components(o["related_components"]) if o.has_key?("related_components")
-
-      ope = o["operations"]
-      asm.operations[:operation_type] = ope["operation_type"] if ope && ope.has_key?("operation_type")
-      asm.operations[:target_resource] = ope["target_resource"] if ope && ope.has_key?("target_resource")
-      
-      asm.others(o["others"]) if o.has_key?("others")
+      asm.operations(o["operations"]) if o.has_key?("operations")      
+      asm.status(o["status"]) if o.has_key?("status")
       asm.created_at(o["created_at"]) if o.has_key?("created_at")
       asm
     end
@@ -425,30 +215,29 @@ module Megam
       @id                              = o["id"] if o.has_key?("id")
       @name                            = o["name"] if o.has_key?("name")
       @tosca_type                      = o["tosca_type"] if o.has_key?("tosca_type")
-      @requirements                    = o["requirements"] if o.has_key?("requirements")
       @inputs                          = o["inputs"] if o.has_key?("inputs")
-      @external_management_resource    = o["external_management_resource"] if o.has_key?("external_management_resource")
+      @outputs                         = o["outputs"] if o.has_key?("outputs")
       @artifacts                       = o["artifacts"] if o.has_key?("artifacts")
       @related_components              = o["related_components"] if o.has_key?("related_components")
       @operations                      = o["operations"] if o.has_key?("operations")
-      @others                          = o["others"] if o.has_key?("others")
+      @status                          = o["status"] if o.has_key?("status")
       @created_at                      = o["created_at"] if o.has_key?("created_at")
       self
     end
 
-    def self.create(o,tmp_email=nil, tmp_api_key=nil)
-      asm = from_hash(o, tmp_email, tmp_api_key)
+    def self.create(params)
+      asm = from_hash(params, params["email"], params["api_key"])
       asm.create
     end
 
     # Load a account by email_p
-    def self.show(comp_id, tmp_email=nil, tmp_api_key=nil)
-      asm = self.new(tmp_email, tmp_api_key)
-      asm.megam_rest.get_components(comp_id)
+    def self.show(params)
+      asm = self.new(params["email"], params["api_key"])
+      asm.megam_rest.get_components(params["id"])
     end
 
-    def self.update(o,tmp_email=nil, tmp_api_key=nil)
-      asm = from_hash(o, tmp_email, tmp_api_key)
+    def self.update(params)
+      asm = from_hash(params, params["email"], params["api_key"])
       asm.update
     end
 

data/lib/megam/core/marketplace.rb

@@ -192,8 +192,8 @@ module Megam
       self
     end
 
-    def self.create(o,tmp_email=nil, tmp_api_key=nil)
-      acct = from_hash(o, tmp_email, tmp_api_key)
+    def self.create(params)
+      acct = from_hash(params, params["email"], params["api_key"])
       acct.create
     end
 

data/lib/megam/core/sshkey.rb

@@ -1,4 +1,3 @@
-
 # Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
@@ -19,8 +18,8 @@ module Megam
     def initialize(email=nil, api_key=nil)
       @id = nil
       @name = nil
-      @accounts_id = nil      
-      @path=nil      
+      @accounts_id = nil
+      @path=nil
       @created_at = nil
       @some_msg = {}
       super(email, api_key)
@@ -30,7 +29,6 @@ module Megam
       self
     end
 
-    
     def id(arg=nil)
       if arg != nil
         @id = arg
@@ -54,7 +52,6 @@ module Megam
       @accounts_id
       end
     end
-    
 
     def path(arg=nil)
       if arg != nil
@@ -62,7 +59,7 @@ module Megam
       else
       @path
       end
-    end  
+    end
 
     def created_at(arg=nil)
       if arg != nil
@@ -91,7 +88,7 @@ module Megam
       index_hash["id"] = id
       index_hash["name"] = name
       index_hash["accounts_id"] = accounts_id
-      index_hash["path"] = path     
+      index_hash["path"] = path
       index_hash["created_at"] = created_at
       index_hash
     end
@@ -107,7 +104,7 @@ module Megam
         "id" => id,
         "name" => name,
         "accounts_id" => accounts_id,
-        "path" => path,        
+        "path" => path,
         "created_at" => created_at
       }
       result
@@ -117,8 +114,8 @@ module Megam
     def self.json_create(o)
       sshKey = new
       sshKey.id(o["id"]) if o.has_key?("id")
-      sshKey.name(o["name"]) if o.has_key?("name")     
-      sshKey.path(o["path"]) if o.has_key?("path")     
+      sshKey.name(o["name"]) if o.has_key?("name")
+      sshKey.path(o["path"]) if o.has_key?("path")
       sshKey.created_at(o["created_at"]) if o.has_key?("created_at")
       #success or error
       sshKey.some_msg[:code] = o["code"] if o.has_key?("code")
@@ -136,14 +133,14 @@ module Megam
 
     def from_hash(o)
       @id        = o[:id] if o.has_key?(:id)
-      @name = o[:name] if o.has_key?(:name)      
-      @path   = o[:path] if o.has_key?(:path)   
+      @name = o[:name] if o.has_key?(:name)
+      @path   = o[:path] if o.has_key?(:path)
       @created_at   = o[:created_at] if o.has_key?(:created_at)
       self
     end
 
-    def self.create(o,tmp_email=nil, tmp_api_key=nil)
-      acct = from_hash(o,tmp_email, tmp_api_key)
+    def self.create(params)
+      acct = from_hash(params, params["email"], params["api_key"])
       acct.create
     end
 
@@ -156,15 +153,15 @@ module Megam
     # returns a sshkeysCollection
     # don't return self. check if the Megam::SshKeyCollection is returned.
     def self.list(params)
-    sshKey = self.new(params["email"], params["api_key"])
+      sshKey = self.new(params["email"], params["api_key"])
       sshKey.megam_rest.get_sshkeys
     end
 
     # Show a particular sshKey by name,
     # Megam::SshKey
-    def self.show(p_name,tmp_email=nil, tmp_api_key=nil)
-    pre = self.new(tmp_email,tmp_api_key)
-    pre.megam_rest.get_sshkey(p_name)
+    def self.show(params)
+      pre = self.new(params["email"], params["api_key"])
+      pre.megam_rest.get_sshkey(params["name"])
     end
 
     def to_s

data/test/test_assembly.rb

@@ -18,8 +18,8 @@ class TestApps < MiniTest::Unit::TestCase
           "ptype" => "colocated",
           "members" => ["calcines.megam.co/MattieGarcia","calcines.megam.co/parsnip"]
         }],
-      "inputs" => "",
-      "operations" => "",
+      "inputs" => [],
+      "operations" => [],
       "output" => [],
       "status" => "Launching",
       "created_at" => "2014-10-29 13:24:06 +0000"

data/test/test_components.rb

@@ -10,42 +10,17 @@ class TestApps < MiniTest::Unit::TestCase
     tmp_hash = {
       "id" => "COM1139245887592202240",
       "name" => "NettieMoore",
-      "tosca_type" => "tosca.web.redis",
-      "requirements" => {
-        "host" => "clouddefault1139222212843274240",
-        "dummy" => ""
-      },
-      "inputs" => {
-        "domain" => "megam.co",
-        "port" => "6379",
-        "username" => "",
-        "password" => "",
-        "version" => "",
-        "source" => "",
-        "design_inputs" => {
-          "id" => "39bb18e7.c644e8",
-          "x" => "802",
-          "y" => "331",
-          "z" => "3f43bde9.c0bc42",
-          "wires" => ["cae50d7.f351af"]
-        },
-        "service_inputs" => {
-          "dbname" => "",
-          "dbpassword" => ""
-        }
-      },
-      "external_management_resource" => "",
+      "tosca_type" => "tosca.web.redis",      
+      "inputs" => [],
+      "outputs" => [],
       "artifacts" => {
         "artifact_type" => "tosca type",
         "content" => "",
-        "artifact_requirements" => ""
+        "artifact_requirements" => []
       },
       "related_components" => "AntonioMcCormick.megam.co/TimothyHenderson",
-      "operations" => {
-        "operation_type" => "",
-        "target_resource" => ""
-      },
-      "others" => [],
+      "operations" => [],
+      "status" => "",
       "created_at" => "2014-10-29 14:06:39 +0000"
     }
     response = megams.update_component(tmp_hash)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.47'
+  version: '0.48'
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon