megam_api 0.23 → 0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed8e85c99104ae0dbc964b06fac754abeb9170e0
-  data.tar.gz: 898bb08d102dfd8b7c893d58fcf0333b3583d089
+  metadata.gz: 8555abcfba66ec92bd932251a6e87e1d76b9fe86
+  data.tar.gz: 6ad271b618237e58e142eec627a7fb9a62ddf733
 SHA512:
-  metadata.gz: 2a6e66718f6d8eb1c8a0c9092d97d1c40224f504793db9284eb3db638670762df74d9c6a7c3522881a27340ef025011eaa6b158579db07d1241ef6d924519c22
-  data.tar.gz: be916ffcea604388b8fe46a7e367c7b723b73ccce0955d95f0ca3eec30dbfc62787f58595c7c5aac47453cfd5eea591005e4b5fcf2e46e9108ff8f15eeb4ab8e
+  metadata.gz: a22a9a8745fe9821084ec53969b92b4df1e78bb950c99b5d1694c5330d9c9b18729364c8e7b13529c6ed2e5e3e69b6c5ce4ae8eb9c142acca15ced561537fe5b
+  data.tar.gz: f90d1ba428e0ef6a33681ec9a335b2bc83ec211db18529bff33dbfd80e375d7df0070edd6ba1174cd9068e5adea6433a525e468c3ed968cf5d6daa9860428a0a

data/lib/megam/api/assembly.rb

@@ -10,6 +10,17 @@ module Megam
         :body     => @options[:body]
       )
     end
+    
+     def update_assembly(new_asm)
+      @options = {:path => '/assembly/update',
+        :body => Megam::JSONCompat.to_json(new_asm)}.merge(@options)
+
+      request(
+        :expects  => [200, 201],
+        :method   => :post,
+        :body     => @options[:body]
+      )
+    end
 
   end
 end

data/lib/megam/api/components.rb

@@ -9,6 +9,17 @@ module Megam
         :body     => @options[:body]
       )
     end
+    
+     def update_component(new_asm)
+      @options = {:path => '/components/update',
+        :body => Megam::JSONCompat.to_json(new_asm)}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :post,
+        :body     => @options[:body]
+      )
+    end
 
   end
 end

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.23"
+    VERSION = "0.24"
   end
 end

data/lib/megam/core/assembly.rb

@@ -20,7 +20,7 @@ module Megam
       @id = nil
       @name = nil
       @components = []
-      @policies={}
+      @policies=[]
       @inputs = {}
       @operations = nil
       @created_at = nil
@@ -163,6 +163,16 @@ module Megam
       asm.megam_rest.get_one_assembly(assembly_id)
     end
     
+     def self.update(o,tmp_email=nil, tmp_api_key=nil)
+      asm = from_hash(o, tmp_email, tmp_api_key)
+      asm.update
+    end
+
+    # Create the node via the REST API
+
+    def update
+      megam_rest.update_assembly(to_hash)
+    end
 
     def to_s
       Megam::Stuff.styled_hash(to_hash)

data/lib/megam/core/components.rb

@@ -47,8 +47,8 @@ module Megam
       @operations = {}
       @operation_type = nil
       @target_resource = nil
-      @created_at = nil    
-    
+      @created_at = nil
+
       super(email, api_key)
     end
 
@@ -56,14 +56,14 @@ module Megam
       self
     end
 
-      def id(arg=nil)
+    def id(arg=nil)
       if arg != nil
         @id = arg
       else
       @id
       end
-    end      
- 
+    end
+
     def name(arg=nil)
       if arg != nil
         @name = arg
@@ -71,231 +71,231 @@ module Megam
       @name
       end
     end
-      
-      def tosca_type(arg=nil)
+
+    def tosca_type(arg=nil)
       if arg != nil
         @tosca_type = arg
       else
       @tosca_type
       end
     end
-      
-      def requirements(arg=nil)
+
+    def requirements(arg=nil)
       if arg != nil
         @requirements = arg
       else
       @requirements
       end
     end
-      
-      def host(arg=nil)
+
+    def host(arg=nil)
       if arg != nil
         @host = arg
       else
       @host
       end
     end
-      
-      def dummy(arg=nil)
+
+    def dummy(arg=nil)
       if arg != nil
         @dummy = arg
       else
       @dummy
       end
     end
-      
-      def inputs(arg=[])
+
+    def inputs(arg=[])
       if arg != []
         @inputs = arg
       else
       @inputs
       end
     end
-      
-      def domain(arg=nil)
+
+    def domain(arg=nil)
       if arg != nil
         @domain = arg
       else
       @domain
       end
     end
-      
-      def port(arg=nil)
+
+    def port(arg=nil)
       if arg != nil
         @port = arg
       else
       @port
       end
     end
-      
-      def username(arg=nil)
+
+    def username(arg=nil)
       if arg != nil
         @username = arg
       else
       @username
       end
     end
-      
-      def password(arg=nil)
+
+    def password(arg=nil)
       if arg != nil
         @password = arg
       else
       @password
       end
     end
-      
-      def version(arg=nil)
+
+    def version(arg=nil)
       if arg != nil
         @version = arg
       else
       @version
       end
     end
-      
-      def source(arg=nil)
+
+    def source(arg=nil)
       if arg != nil
         @source = arg
       else
       @source
       end
     end
-      
-      def design_inputs(arg=nil)
+
+    def design_inputs(arg=nil)
       if arg != nil
         @design_inputs = arg
       else
       @design_inputs
       end
     end
-      
-      def x(arg=nil)
+
+    def x(arg=nil)
       if arg != nil
         @x = arg
       else
       @x
       end
     end
-      
-      def y(arg=nil)
+
+    def y(arg=nil)
       if arg != nil
         @y = arg
       else
       @y
       end
     end
-      
-      def z(arg=nil)
+
+    def z(arg=nil)
       if arg != nil
         @z = arg
       else
       @z
       end
     end
-      
-      def wires(arg=nil)
+
+    def wires(arg=nil)
       if arg != nil
         @wires = arg
       else
       @wires
       end
     end
-      
-      def service_inputs(arg=nil)
+
+    def service_inputs(arg=nil)
       if arg != nil
         @service_inputs = arg
       else
       @service_inputs
       end
     end
-      
-      def dbname(arg=nil)
+
+    def dbname(arg=nil)
       if arg != nil
         @dbname = arg
       else
       @dbname
       end
     end
-      
-      def dbpassword(arg=nil)
+
+    def dbpassword(arg=nil)
       if arg != nil
         @dbpassword = arg
       else
       @dbpassword
       end
     end
-      
-      def external_management_resource(arg=nil)
+
+    def external_management_resource(arg=nil)
       if arg != nil
         @external_management_resource = arg
       else
       @external_management_resource
       end
     end
-      
-      def artifacts(arg=nil)
+
+    def artifacts(arg=nil)
       if arg != nil
         @artifacts = arg
       else
       @artifacts
       end
     end
-      
-      def artifact_type(arg=nil)
+
+    def artifact_type(arg=nil)
       if arg != nil
         @artifact_type = arg
       else
       @artifact_type
       end
     end
-      
-      def content(arg=nil)
+
+    def content(arg=nil)
       if arg != nil
         @content = arg
       else
       @content
       end
     end
-      
-      def artifact_requirements(arg=nil)
+
+    def artifact_requirements(arg=nil)
       if arg != nil
         @artifact_requirements = arg
       else
       @artifact_requirements
       end
     end
-      
-      def related_components(arg=nil)
+
+    def related_components(arg=nil)
       if arg != nil
         @related_components = arg
       else
       @related_components
       end
     end
-      
-      def operations(arg=nil)
+
+    def operations(arg=nil)
       if arg != nil
         @operations = arg
       else
       @operations
       end
     end
-      
-      def operation_type(arg=nil)
+
+    def operation_type(arg=nil)
       if arg != nil
         @operation_type = arg
       else
       @operation_type
       end
     end
-      
-      def target_resource(arg=nil)
+
+    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
@@ -352,12 +352,12 @@ 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"]    
+
+      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"]    
+      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")
@@ -366,29 +366,29 @@ module Megam
       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")
-      
+      # 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"]    
+
+      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"]    
+
+      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
@@ -399,10 +399,11 @@ module Megam
       asm
     end
 
-    def from_hash(o)          
+    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")
+      @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")
       @artifacts                       = o["artifacts"] if o.has_key?("artifacts")
@@ -416,15 +417,23 @@ module Megam
       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)     
+      asm.megam_rest.get_components(comp_id)
+    end
+
+    def self.update(o,tmp_email=nil, tmp_api_key=nil)
+      asm = from_hash(o, tmp_email, tmp_api_key)
+      asm.update
+    end
+
+    # Create the node via the REST API
+    def update
+      megam_rest.update_component(to_hash)
     end
 
-   
     def to_s
       Megam::Stuff.styled_hash(to_hash)
     end

data/test/test_assembly.rb

@@ -1,10 +1,29 @@
 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
 
+  def test_update_assembly
+    tmp_hash = {
+      "id" => "ASM1139235178976247808",
+      "json_claz" => "Megam::Assembly",
+      "name" => "calcines",
+      "components" => ["COM1139235178934304768",""],
+      "policies" => [{
+          "name" => "bind policy",
+          "ptype" => "colocated",
+          "members" => ["calcines.megam.co/MattieGarcia","calcines.megam.co/parsnip"]
+        }],
+      "inputs" => "",
+      "operations" => "",
+      "created_at" => "2014-10-29 13:24:06 +0000"
+    }
+
+    response = megams.update_assembly(tmp_hash)
+    assert_equal(201, response.status)
+  end
 
- def test_get_assembly
-   response = megams.get_one_assembly("ASM1133747830209511424")
-   assert_equal(200, response.status)
- end
 end

data/test/test_components.rb

@@ -1,8 +1,54 @@
 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
+  def test_get_component
+    response = megams.get_components("COM519839138036318208")
+    assert_equal(200, response.status)
+  end
+
+  def test_update_component
+    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" => "",
+      "artifacts" => {
+        "artifact_type" => "tosca type",
+        "content" => "",
+        "artifact_requirements" => ""
+      },
+      "related_components" => "AntonioMcCormick.megam.co/TimothyHenderson",
+      "operations" => {
+        "operation_type" => "",
+        "target_resource" => ""
+      },
+      "created_at" => "2014-10-29 14:06:39 +0000"
+    }
+    response = megams.update_component(tmp_hash)
+    assert_equal(201, response.status)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.23'
+  version: '0.24'
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Ruby Client for the Megam