megam_api 0.18 → 0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6626dcb2360e7260a1bddd92c57e1845345d2356
-  data.tar.gz: 7b1c22613192558107ebf6794e39b60061183bfc
+  metadata.gz: 4ce34e26cf345435dd7f7525248d06e6f39f8ce5
+  data.tar.gz: fe0189ff7e1b6c6150d9dba00e247f3e0037dfed
 SHA512:
-  metadata.gz: 8f631bd0d105ba5859328c7ba165749ca66916fb09ed5e9f34eefc2d7ac35b674aee9bcc195931eab2b464dc6aec04db95d2d199ee5d3bb85544c08c08b80cda
-  data.tar.gz: e01d71f735758230e7e28c9f7f2b7abe50c8c2d707414f877d8e913bc406213e974e22ae8528e17a89f57206c57a48915c2c5b464c55f31d502749cbe734931f
+  metadata.gz: 7d68e3d04b97e4de2aeab4aacd0f772f4fafdc95ba9a16d1d9244820d9ff73e81ec4ba903766ccb96c4774ee998827474e34b6c98d39faf27855079fdc6032a9
+  data.tar.gz: d2d5c151fae29057a4e7ebd576e562036e1b0600836ca2019f6070754a013618607bdef5129bbc67f1da0d0142c197e51f97b3b64ce7f34bb15951179ae31004

data/lib/megam/api/assemblies.rb

@@ -1,6 +1,5 @@
 module Megam
   class API
-
     # GET /nodes
     def get_assemblies
       @options = {:path => '/assemblies',:body => ""}.merge(@options)
@@ -12,7 +11,7 @@ module Megam
       )
     end
 
-    def get_assemblies(asm_id)
+    def get_one_assemblies(asm_id)
       @options = {:path => "/assemblies/#{asm_id}",:body => ""}.merge(@options)
 
       request(

data/lib/megam/api/assembly.rb

@@ -0,0 +1,15 @@
+module Megam
+  class API
+    def get_one_assembly(asm_id)
+
+      @options = {:path => "/assembly/#{asm_id}",:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+
+  end
+end

data/lib/megam/api/components.rb

@@ -0,0 +1,14 @@
+module Megam
+  class API
+    def get_components(comp_id)
+      @options = {:path => "/components/#{comp_id}",:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+
+  end
+end

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.18"
+    VERSION = "0.19"
   end
 end

data/lib/megam/api.rb

@@ -28,6 +28,8 @@ require "megam/api/organizations"
 require "megam/api/domains"
 require "megam/api/csars"
 require "megam/api/assemblies"
+require "megam/api/assembly"
+require "megam/api/components"
 
 require "megam/core/server_api"
 require "megam/core/config"
@@ -57,6 +59,11 @@ require "megam/core/assemblies_collection"
 require "megam/core/csar"
 require "megam/core/csar_collection"
 require "megam/core/konipai"
+require "megam/core/assembly"
+require "megam/core/assembly_collection"
+require "megam/core/components"
+require "megam/core/components_collection"
+
 
 
 

data/lib/megam/core/assemblies.rb

@@ -162,12 +162,12 @@ module Megam
     end
 
     # Load a account by email_p
-    def self.show(node_name, tmp_email=nil, tmp_api_key=nil)
+    def self.show(one_assemblies_id, tmp_email=nil, tmp_api_key=nil)
       asm = self.new(tmp_email, tmp_api_key)
-      asm.megam_rest.get_assemblies(node_name)
+      asm.megam_rest.get_one_assemblies(one_assemblies_id)
     end
 
-    def self.list(tmp_email=nil, tmp_api_key=nil)
+    def self.list(tmp_email=nil, tmp_api_key=nil, inflated=false)
       asm = self.new(tmp_email, tmp_api_key)
       asm.megam_rest.get_assemblies
     end
@@ -177,4 +177,4 @@ module Megam
     end
 
   end
-end
+end

data/lib/megam/core/assembly.rb

@@ -0,0 +1,172 @@
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Megam
+  class Assembly < Megam::ServerAPI
+    def initialize(email=nil, api_key=nil)
+      @id = nil
+      @name = nil
+      @components = []
+      @policies={}
+      @inputs = {}
+      @operations = nil
+      @created_at = nil
+      super(email, api_key)
+    end
+
+    def assembly
+      self
+    end
+
+    def id(arg=nil)
+      if arg != nil
+        @id = arg
+      else
+      @id
+      end
+    end
+
+    def name(arg=nil)
+      if arg != nil
+        @name = arg
+      else
+      @name
+      end
+    end
+
+    def components(arg=[])
+      if arg != []
+        @components = arg
+      else
+      @components
+      end
+    end
+
+    def policies(arg=[])
+      if arg != []
+        @policies = arg
+      else
+      @policies
+      end
+    end
+
+    def inputs(arg=[])
+      if arg != []
+        @inputs = arg
+      else
+      @inputs
+      end
+    end
+
+    def operations(arg=nil)
+      if arg != nil
+        @operations = arg
+      else
+      @operations
+      end
+    end
+
+    def created_at(arg=nil)
+      if arg != nil
+        @created_at = arg
+      else
+      @created_at
+      end
+    end
+
+    def error?
+      crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
+    end
+
+    # Transform the ruby obj ->  to a Hash
+    def to_hash
+      index_hash = Hash.new
+      index_hash["json_claz"] = self.class.name
+      index_hash["id"] = id
+      index_hash["name"] = name
+      index_hash["components"] = components
+      index_hash["policies"] = policies
+      index_hash["inputs"] = inputs
+      index_hash["operations"] = operations
+      index_hash["created_at"] = created_at
+      index_hash
+    end
+
+    # Serialize this object as a hash: called from JsonCompat.
+    # Verify if this called from JsonCompat during testing.
+    def to_json(*a)
+      for_json.to_json(*a)
+    end
+
+    def for_json
+      result = {
+        "id" => id,
+        "name" => name,
+        "components" => components,
+        "policies" => policies,
+        "inputs" => inputs,
+        "operations" => operations,
+        "created_at" => created_at
+      }
+           
+      result
+    end
+
+    def self.json_create(o)
+      asm = new
+      asm.id(o["id"]) if o.has_key?("id")
+      asm.name(o["name"]) if o.has_key?("name")
+      asm.components(o["components"]) if o.has_key?("components")
+      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")
+      asm.created_at(o["created_at"]) if o.has_key?("created_at")
+      asm
+    end
+
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
+      asm = self.new(tmp_email, tmp_api_key)
+      asm.from_hash(o)
+      asm
+    end
+
+    def from_hash(o)
+      @id                = o["id"] if o.has_key?("id")
+      @name              = o["name"] if o.has_key?("name")
+      @components        = o["components"] if o.has_key?("components")
+      @policies          = o["policies"] if o.has_key?("policies")
+      @inputs            = o["inputs"] if o.has_key?("inputs")
+      @operations        = o["operations"] if o.has_key?("operations")
+      @created_at        = o["created_at"] if o.has_key?("created_at")
+      self
+    end
+
+    
+    def self.show(assembly_id, tmp_email=nil, tmp_api_key=nil)
+      asm = self.new(tmp_email, tmp_api_key)
+      puts "---->>>> "
+      puts #{assembly_id}
+      puts "----------->>>"
+      asm.megam_rest.get_one_assembly(assembly_id)
+    end
+    
+
+    def to_s
+      Megam::Stuff.styled_hash(to_hash)
+    end
+
+  end
+end

data/lib/megam/core/assembly_collection.rb

@@ -0,0 +1,145 @@
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module Megam
+  class AssemblyCollection
+    include Enumerable
+
+    attr_reader :iterator
+    def initialize
+      @assemblys = Array.new
+      @assemblys_by_name = Hash.new
+      @insert_after_idx = nil
+    end
+
+    def all_assemblys
+      @assemblys
+    end
+
+    def [](index)
+      @assemblys[index]
+    end
+
+    def []=(index, arg)
+      is_megam_assemblys(arg)
+      @assemblys[index] = arg
+      @assemblys_by_name[arg.name] = index
+    end
+
+    def <<(*args)
+      args.flatten.each do |a|
+        is_megam_assemblys(a)
+        @assemblys << a
+        @assemblys_by_name[a.name] = @assemblys.length - 1
+      end
+      self
+    end
+
+    # 'push' is an alias method to <<
+    alias_method :push, :<<
+
+    def insert(assemblys)
+      is_megam_assemblys(assemblys)
+      if @insert_after_idx
+        # in the middle of executing a run, so any nodes inserted now should
+        # be placed after the most recent addition done by the currently executing
+        # node
+        @assemblys.insert(@insert_after_idx + 1, assemblys)
+        # update name -> location mappings and register new node
+        @assemblys_by_name.each_key do |key|
+        @assemblys_by_name[key] += 1 if @assemblys_by_name[key] > @insert_after_idx
+        end
+        @assemblys_by_name[assemblys.name] = @insert_after_idx + 1
+        @insert_after_idx += 1
+      else
+      @assemblys << assemblys
+      @assemblys_by_name[assemblys.name] = @assemblys.length - 1
+      end
+    end
+
+    def each
+      @assemblys.each do |assemblys|
+        yield assemblys
+      end
+    end
+
+    def each_index
+      @assemblys.each_index do |i|
+        yield i
+      end
+    end
+
+    def empty?
+      @assemblys.empty?
+    end
+
+    def lookup(assemblys)
+      lookup_by = nil
+      if assemblys.kind_of?(Megam::Assembly)
+      lookup_by = assemblys.name
+      elsif assemblys.kind_of?(String)
+      lookup_by = assemblys
+      else
+        raise ArgumentError, "Must pass a Megam::Assemblies or String to lookup"
+      end
+      res = @assemblys_by_name[lookup_by]
+      unless res
+        raise ArgumentError, "Cannot find a node matching #{lookup_by} (did you define it first?)"
+      end
+      @assemblys[res]
+    end
+
+    # Transform the ruby obj ->  to a Hash
+    def to_hash
+      index_hash = Hash.new
+      self.each do |assemblys|
+        index_hash[assemblys.name] = assemblys.to_s
+      end
+      index_hash
+    end
+
+    # Serialize this object as a hash: called from JsonCompat.
+    # Verify if this called from JsonCompat during testing.
+    def to_json(*a)
+      for_json.to_json(*a)
+    end
+
+    def self.json_create(o)
+      collection = self.new()
+      o["results"].each do |assemblys_list|
+        assemblys_array = assemblys_list.kind_of?(Array) ? assemblys_list : [ assemblys_list ]
+        assemblys_array.each do |assemblys|
+          collection.insert(assemblys)
+
+        end
+      end
+      collection
+    end
+
+    private
+
+    def is_megam_assemblys(arg)
+      unless arg.kind_of?(Megam::Assembly)
+        raise ArgumentError, "Members must be Megam::Assembly's"
+      end
+      true
+    end
+
+    def to_s
+      Megam::Stuff.styled_hash(to_hash)
+    end
+
+  end
+end

data/lib/megam/core/components.rb

@@ -0,0 +1,433 @@
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Megam
+  class Components < Megam::ServerAPI
+    def initialize(email=nil, api_key=nil)
+      @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
+      @dbname = nil
+      @dbpassword = nil
+      @external_management_resource = nil
+      @artifacts = {}
+      @artifact_type = nil
+      @content = nil
+      @artifact_requirements = nil
+      @related_components = nil
+      @operations = {}
+      @operation_type = nil
+      @target_resource = nil
+      @created_at = nil    
+    
+      super(email, api_key)
+    end
+
+    def components
+      self
+    end
+
+      def id(arg=nil)
+      if arg != nil
+        @id = arg
+      else
+      @id
+      end
+    end      
+ 
+    def name(arg=nil)
+      if arg != nil
+        @name = arg
+      else
+      @name
+      end
+    end
+      
+      def tosca_type(arg=nil)
+      if arg != nil
+        @tosca_type = arg
+      else
+      @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
+      else
+      @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 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
+      else
+      @external_management_resource
+      end
+    end
+      
+      def artifacts(arg=nil)
+      if arg != nil
+        @artifacts = arg
+      else
+      @artifacts
+      end
+    end
+      
+      def artifact_type(arg=nil)
+      if arg != nil
+        @artifact_type = arg
+      else
+      @artifact_type
+      end
+    end
+      
+      def content(arg=nil)
+      if arg != nil
+        @content = arg
+      else
+      @content
+      end
+    end
+      
+      def artifact_requirements(arg=nil)
+      if arg != nil
+        @artifact_requirements = arg
+      else
+      @artifact_requirements
+      end
+    end
+      
+      def related_components(arg=nil)
+      if arg != nil
+        @related_components = arg
+      else
+      @related_components
+      end
+    end
+      
+      def operations(arg=nil)
+      if arg != nil
+        @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 created_at(arg=nil)
+      if arg != nil
+        @created_at = arg
+      else
+      @created_at
+      end
+    end
+
+    def error?
+      crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
+    end
+
+    # Transform the ruby obj ->  to a Hash
+    def to_hash
+      index_hash = Hash.new
+      index_hash["json_claz"] = self.class.name
+      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["artifacts"] = artifacts
+      index_hash["related_components"] = related_components
+      index_hash["operations"] = operations
+      index_hash["created_at"] = created_at
+      index_hash
+    end
+
+    # Serialize this object as a hash: called from JsonCompat.
+    # Verify if this called from JsonCompat during testing.
+    def to_json(*a)
+      for_json.to_json(*a)
+    end
+
+    def for_json
+      result = {
+        "id" => id,
+        "name" => name,
+        "tosca_type" => tosca_type,
+        "requirements" => requirements,
+        "inputs" => inputs,
+        "external_management_resource" => external_management_resource,
+        "artifacts" => artifacts,
+        "related_components" => related_components,
+        "operations" => operations,
+        "created_at" => created_at
+      }
+      result
+    end
+
+    def self.json_create(o)
+      asm = new
+      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")
+     # 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")
+      
+      ar = o["artifacts"]    
+      asm.artifacts[:artifact_type] = ar["artifact_type"] if ar && ar.has_key?("artifact_type")
+      asm.artifacts[:content] = ar["content"] if ar && ar.has_key?("content")
+      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.created_at(o["created_at"]) if o.has_key?("created_at")
+      asm
+    end
+
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
+      asm = self.new(tmp_email, tmp_api_key)
+      asm.from_hash(o)
+      asm
+    end
+
+    def from_hash(o)          
+      @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")
+      @inputs                          = o["inputs"] if o.has_key?("inputs")
+      @external_management_resource    = o["external_management_resource"] if o.has_key?("external_management_resource")
+      @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")
+      @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)
+      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)     
+    end
+
+   
+    def to_s
+      Megam::Stuff.styled_hash(to_hash)
+    end
+
+  end
+end

data/lib/megam/core/components_collection.rb

@@ -0,0 +1,145 @@
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module Megam
+  class ComponentsCollection
+    include Enumerable
+
+    attr_reader :iterator
+    def initialize
+      @components = Array.new
+      @components_by_name = Hash.new
+      @insert_after_idx = nil
+    end
+
+    def all_components
+      @components
+    end
+
+    def [](index)
+      @components[index]
+    end
+
+    def []=(index, arg)
+      is_megam_components(arg)
+      @components[index] = arg
+      @components_by_name[arg.name] = index
+    end
+
+    def <<(*args)
+      args.flatten.each do |a|
+        is_megam_components(a)
+        @components << a
+        @components_by_name[a.name] = @components.length - 1
+      end
+      self
+    end
+
+    # 'push' is an alias method to <<
+    alias_method :push, :<<
+
+    def insert(components)
+      is_megam_components(components)
+      if @insert_after_idx
+        # in the middle of executing a run, so any nodes inserted now should
+        # be placed after the most recent addition done by the currently executing
+        # node
+        @components.insert(@insert_after_idx + 1, components)
+        # update name -> location mappings and register new node
+        @components_by_name.each_key do |key|
+        @components_by_name[key] += 1 if @components_by_name[key] > @insert_after_idx
+        end
+        @components_by_name[components.name] = @insert_after_idx + 1
+        @insert_after_idx += 1
+      else
+      @components << components
+      @components_by_name[components.name] = @components.length - 1
+      end
+    end
+
+    def each
+      @components.each do |components|
+        yield components
+      end
+    end
+
+    def each_index
+      @components.each_index do |i|
+        yield i
+      end
+    end
+
+    def empty?
+      @components.empty?
+    end
+
+    def lookup(components)
+      lookup_by = nil
+      if components.kind_of?(Megam::Components)
+      lookup_by = components.name
+      elsif components.kind_of?(String)
+      lookup_by = components
+      else
+        raise ArgumentError, "Must pass a Megam::components or String to lookup"
+      end
+      res = @components_by_name[lookup_by]
+      unless res
+        raise ArgumentError, "Cannot find a node matching #{lookup_by} (did you define it first?)"
+      end
+      @components[res]
+    end
+
+    # Transform the ruby obj ->  to a Hash
+    def to_hash
+      index_hash = Hash.new
+      self.each do |components|
+        index_hash[components.name] = components.to_s
+      end
+      index_hash
+    end
+
+    # Serialize this object as a hash: called from JsonCompat.
+    # Verify if this called from JsonCompat during testing.
+    def to_json(*a)
+      for_json.to_json(*a)
+    end
+
+    def self.json_create(o)
+      collection = self.new()
+      o["results"].each do |components_list|
+        components_array = components_list.kind_of?(Array) ? components_list : [ components_list ]
+        components_array.each do |components|
+          collection.insert(components)
+
+        end
+      end
+      collection
+    end
+
+    private
+
+    def is_megam_components(arg)
+      unless arg.kind_of?(Megam::Components)
+        raise ArgumentError, "Members must be Megam::components"
+      end
+      true
+    end
+
+    def to_s
+      Megam::Stuff.styled_hash(to_hash)
+    end
+
+  end
+end

data/lib/megam/core/json_compat.rb

@@ -22,47 +22,33 @@ module Megam
 
     JSON_CLAZ = "json_claz".freeze
 
-    MEGAM_AUTH                    = "Megam::Auth".freeze
-    MEGAM_ERROR                   = "Megam::Error".freeze
-    MEGAM_ACCOUNT                 = "Megam::Account".freeze
-    MEGAM_NODE                    = "Megam::Node".freeze
-    MEGAM_NODECOLLECTION          = "Megam::NodeCollection".freeze
-    MEGAM_APPDEFNS                = "Megam::AppDefns".freeze
-    MEGAM_APPREQUEST              = "Megam::AppRequest".freeze
-    MEGAM_BOLTREQUEST             = "Megam::BoltRequest".freeze
-    MEGAM_BOLTDEFNS               = "Megam::BoltDefns".freeze
-    MEGAM_APPDEFNSCOLLECTION      = "Megam::AppDefnCollection".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
-    MEGAM_ORGANIZATION            = "Megam::Organizations".freeze
-    MEGAM_DOMAIN                  = "Megam::Domains".freeze
-    MEGAM_ASSEMBLIES              = "Megam::Assemblies".freeze
-    MEGAM_ASSEMBLIESCOLLECTION    = "Megam::AssembliesCollection".freeze
-
-    MEGAM_PREDEF                  = "Megam::Predef".freeze
-    MEGAM_PREDEFCOLLECTION        = "Megam::PredefCollection".freeze
-    MEGAM_PREDEFCLOUD             = "Megam::PredefCloud".freeze
-    MEGAM_PREDEFCLOUDCOLLECTION   = "Megam::PredefCloudCollection".freeze
-    MEGAM_CLOUDTOOL               = "Megam::CloudTool".freeze
-    MEGAM_CLOUDTOOLCOLLECTION     = "Megam::CloudToolCollection".freeze
-    MEGAM_CLOUDTOOLSETTING        = "Megam::CloudToolSetting".freeze
-    MEGAM_CLOUDTOOLSETTINGCOLLECTION    = "Megam::CloudToolSettingCollection".freeze
-    MEGAM_CLOUDTEMPLATE           = "Megam::CloudTemplate".freeze
-    MEGAM_CLOUDTEMPLATECOLLECTION = "Megam::CloudTemplateCollection".freeze
-    MEGAM_CLOUDINSTRUCTION        = "Megam::CloudInstruction".freeze
-    MEGAM_CLOUDINSTRUCTIONCOLLECTION    = "Megam::CloudInstructionCollection".freeze
-    MEGAM_CLOUDINSTRUCTIONGROUP   = "Megam::CloudInstructionGroup".freeze
-    MEGAM_SSHKEY                  = "Megam::SshKey".freeze
-    MEGAM_SSHKEYCOLLECTION        = "Megam::SshKeyCollection".freeze
-    MEGAM_MARKETPLACE             = "Megam::MarketPlace".freeze
-    MEGAM_MARKETPLACECOLLECTION   = "Megam::MarketPlaceCollection".freeze
-    MEGAM_MARKETPLACEADDON             = "Megam::MarketPlaceAddons".freeze
-    MEGAM_MARKETPLACEADDONCOLLECTION   = "Megam::MarketPlaceAddonsCollection".freeze
-    MEGAM_CSAR             = "Megam::CSAR".freeze
-    MEGAM_CSARCOLLECTION   = "Megam::CSARCollection".freeze
+    MEGAM_AUTH                      = "Megam::Auth".freeze
+    MEGAM_ERROR                     = "Megam::Error".freeze
+    MEGAM_ACCOUNT                   = "Megam::Account".freeze
+    MEGAM_ASSEMBLIES                = "Megam::Assemblies".freeze
+    MEGAM_ASSEMBLIESCOLLECTION      = "Megam::AssembliesCollection".freeze
+    MEGAM_ASSEMBLY                  = "Megam::Assembly".freeze
+    MEGAM_ASSEMBLYCOLLECTION        = "Megam::AssemblyCollection".freeze
+    MEGAM_COMPONENTS                = "Megam::Components".freeze
+    MEGAM_COMPONENTSCOLLECTION      = "Megam::ComponentsCollection".freeze
+    MEGAM_REQUEST                   = "Megam::Request".freeze
+    MEGAM_REQUESTCOLLECTION         = "Megam::RequestCollection".freeze
+    MEGAM_ORGANIZATION              = "Megam::Organizations".freeze
+    MEGAM_DOMAIN                    = "Megam::Domains".freeze
+
+    MEGAM_PREDEFCLOUD               = "Megam::PredefCloud".freeze
+    MEGAM_PREDEFCLOUDCOLLECTION     = "Megam::PredefCloudCollection".freeze
+    MEGAM_CLOUDTOOLSETTING          = "Megam::CloudToolSetting".freeze
+    MEGAM_CLOUDTOOLSETTINGCOLLECTION= "Megam::CloudToolSettingCollection".freeze
+    MEGAM_SSHKEY                    = "Megam::SshKey".freeze
+    MEGAM_SSHKEYCOLLECTION          = "Megam::SshKeyCollection".freeze
+    MEGAM_MARKETPLACE               = "Megam::MarketPlace".freeze
+    MEGAM_MARKETPLACECOLLECTION     = "Megam::MarketPlaceCollection".freeze
+    MEGAM_MARKETPLACEADDON          = "Megam::MarketPlaceAddons".freeze
+    MEGAM_MARKETPLACEADDONCOLLECTION= "Megam::MarketPlaceAddonsCollection".freeze
+    MEGAM_CSAR                      = "Megam::CSAR".freeze
+    MEGAM_CSARCOLLECTION            = "Megam::CSARCollection".freeze
+
     class <<self
       # Increase the max nesting for JSON, which defaults
       # to 19, and isn't enough for some (for example, a Node within a Node)
@@ -145,56 +131,26 @@ module Megam
           Megam::Auth
         when MEGAM_ACCOUNT
           Megam::Account
-        when MEGAM_NODE
-          Megam::Node
-        when MEGAM_APPDEFNS
-          Megam::Appdefns
-        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_APPREQUESTCOLLECTION
-          Megam::AppRequestCollection
-        when MEGAM_BOLTREQUESTCOLLECTION
-          Megam::BoltRequestCollection
-        when MEGAM_BOLTDEFNSCOLLECTION
-          Megam::BoltdefnsCollection
+        when MEGAM_ASSEMBLIES
+          Megam::Assemblies
+        when MEGAM_ASSEMBLIESCOLLECTION
+          Megam::AssembliesCollection
+        when MEGAM_ASSEMBLY
+          Megam::Assembly
+        when MEGAM_ASSEMBLYCOLLECTION
+          Megam::AssemblyCollection
+        when MEGAM_COMPONENTS
+          Megam::Components
+        when MEGAM_COMPONENTSCOLLECTION
+          Megam::ComponentsCollection
         when MEGAM_REQUEST
           Megam::Request
         when MEGAM_REQUESTCOLLECTION
           Megam::RequestCollection
-        when MEGAM_PREDEF
-          Megam::Predef
-        when MEGAM_PREDEFCOLLECTION
-          Megam::PredefCollection
         when MEGAM_PREDEFCLOUD
           Megam::PredefCloud
         when MEGAM_PREDEFCLOUDCOLLECTION
           Megam::PredefCloudCollection
-        when MEGAM_CLOUDTOOL
-          Megam::CloudTool
-        when MEGAM_CLOUDTOOLCOLLECTION
-          Megam::CloudToolCollection
-        when MEGAM_CLOUDTOOLSETTING
-          Megam::CloudToolSetting
-        when MEGAM_CLOUDTOOLSETTINGCOLLECTION
-          Megam::CloudToolSettingCollection
-        when MEGAM_CLOUDTEMPLATE
-          Megam::CloudTemplate
-        when MEGAM_CLOUDTEMPLATECOLLECTION
-          Megam::CloudTemplateCollection
-        when MEGAM_CLOUDINSTRUCTION
-          Megam::CloudInstruction
-        when MEGAM_CLOUDINSTRUCTIONGROUP
-          Megam::CloudInstructionGroup
-        when MEGAM_CLOUDINSTRUCTIONCOLLECTION
-          Megam::CloudInstructionCollection
         when MEGAM_SSHKEY
           Megam::SshKey
         when MEGAM_SSHKEYCOLLECTION
@@ -214,11 +170,7 @@ module Megam
         when MEGAM_CSARCOLLECTION
           Megam::CSARCollection
         when MEGAM_DOMAIN
-          Megam::Organizations
-        when MEGAM_ASSEMBLIES
-          Megam::Assemblies
-        when MEGAM_ASSEMBLIESCOLLECTION
-          Megam::AssembliesCollection
+          Megam::Domains
         else
         raise JSON::ParserError, "Unsupported `json_class` type '#{json_class}'"
         end

data/lib/megam/core/organizations.rb

@@ -19,6 +19,7 @@ module Megam
    def initialize(email=nil, api_key=nil)
      @id = nil
      @name = nil
+     @accounts_id = nil
      @created_at = nil
      super(email, api_key)
    end
@@ -36,7 +37,13 @@ def id(arg=nil)
   end
 end
 
-
+def accounts_id(arg=nil)
+  if arg != nil
+     @accounts_id = arg
+  else
+    @accounts_id
+  end
+end
 
 def name(arg=nil)
   if arg != nil
@@ -64,6 +71,7 @@ end
       index_hash["json_claz"] = self.class.name
       index_hash["id"] = id
       index_hash["name"] = name
+      index_hash["accounts_id"] = accounts_id
       index_hash["created_at"] = created_at
       index_hash
     end
@@ -76,6 +84,7 @@ def for_json
   result = {
     "id" => id,
     "name" => name,
+    "accounts_id" => accounts_id,
     "created_at" => created_at
   }
   result
@@ -86,6 +95,7 @@ def self.json_create(o)
   org = new
   org.id(o["id"]) if o.has_key?("id")
   org.name(o["name"]) if o.has_key?("name")
+  org.accounts_id(o["accounts_id"]) if o.has_key?("accounts_id")
   org.created_at(o["created_at"]) if o.has_key?("created_at")
   org
 end
@@ -99,6 +109,7 @@ end
 def from_hash(o)
   @id        = o[:id] if o.has_key?(:id)
   @name     = o[:name] if o.has_key?(:name)
+  @accounts_id = o[:accounts_id] if o.has_key?(:accounts_id)
   @created_at = o[:created_at] if o.has_key?(:created_at)
   self
 end

data/test/test_assemblies.rb

@@ -3,8 +3,13 @@ require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 class TestApps < MiniTest::Unit::TestCase
 
 
- def test_get_assemblies
-   response = megams.get_assemblies("AMS1133263480544165888")
+  def test_get_assemblies
+   response = megams.get_assemblies
+   assert_equal(200, response.status)
+ end
+
+ def test_get_assembly
+   response = megams.get_one_assemblies("AMS1133263480544165888")
    assert_equal(200, response.status)
  end
 end

data/test/test_assembly.rb

@@ -0,0 +1,10 @@
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
+
+class TestApps < MiniTest::Unit::TestCase
+
+
+ def test_get_assembly
+   response = megams.get_one_assembly("ASM1133747830209511424")
+   assert_equal(200, response.status)
+ end
+end

data/test/test_components.rb

@@ -0,0 +1,8 @@
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
+
+class TestApps < MiniTest::Unit::TestCase
+ def test_get_component
+   response = megams.get_components("COM519839138036318208")
+   assert_equal(200, response.status)
+ end
+end

data/test/test_domains.rb

@@ -6,7 +6,7 @@ class TestDomains < MiniTest::Unit::TestCase
   $normal = "normal-tom"
   $tom_email = "tom@gomegam.com"
   $bob_email = "bob@gomegam.com"
-  
+
 
   def test_get_domains_good
     response =megams.get_domains(domain_name)
@@ -17,7 +17,7 @@ class TestDomains < MiniTest::Unit::TestCase
 
   def test_post_domains_good
   tmp_hash = {
-    "name" => "dmnname"}
+    "name" => "dmnname1"}
 
     response =megams.post_domains(tmp_hash)
     response.body.to_s

data/test/test_helper.rb

@@ -65,7 +65,7 @@ def domain_name
 end
 
 def sandbox_name
-  "Default_Org"
+  "Megam6"
 end
 
 def sandbox_apikey

data/test/test_organizations.rb

@@ -6,21 +6,21 @@ class TestOrganizations < MiniTest::Unit::TestCase
   $normal = "normal-tom"
   $tom_email = "tom@gomegam.com"
   $bob_email = "bob@gomegam.com"
-  
+
 
   def test_get_organizations_good
     response =megams.get_organizations(sandbox_name)
     response.body.to_s
     assert_equal(200, response.status)
   end
-
+=begin
 
   def test_post_organizations_good
     tmp_hash = {
-     "name" => "orgname"}
+     "name" => "orgname3"}
     response =megams.post_organizations(tmp_hash)
     response.body.to_s
     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.18'
+  version: '0.19'
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -131,7 +131,9 @@ files:
 - lib/megam/api.rb
 - lib/megam/api/accounts.rb
 - lib/megam/api/assemblies.rb
+- lib/megam/api/assembly.rb
 - lib/megam/api/cloud_tool_settings.rb
+- lib/megam/api/components.rb
 - lib/megam/api/csars.rb
 - lib/megam/api/domains.rb
 - lib/megam/api/errors.rb
@@ -146,9 +148,13 @@ files:
 - lib/megam/core/account.rb
 - lib/megam/core/assemblies.rb
 - lib/megam/core/assemblies_collection.rb
+- lib/megam/core/assembly.rb
+- lib/megam/core/assembly_collection.rb
 - lib/megam/core/auth.rb
 - lib/megam/core/cloudtoolsetting.rb
 - lib/megam/core/cloudtoolsetting_collection.rb
+- lib/megam/core/components.rb
+- lib/megam/core/components_collection.rb
 - lib/megam/core/config.rb
 - lib/megam/core/csar.rb
 - lib/megam/core/csar_collection.rb
@@ -177,7 +183,9 @@ files:
 - megam_api.gemspec
 - test/test_accounts.rb
 - test/test_assemblies.rb
+- test/test_assembly.rb
 - test/test_cloudtoolsettings.rb
+- test/test_components.rb
 - test/test_csars.rb
 - test/test_domains.rb
 - test/test_helper.rb