megam_api 0.90 → 0.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bc860601d6f110c60235eb167e5a74df74fca9d
-  data.tar.gz: ff49084b1935212cc832f82dfd803d0dd2fbb3b0
+  metadata.gz: 24f8d9e0e0b83654018d7c36d661b04450ce4352
+  data.tar.gz: 90ba0a6376f73313c9b2f3968de3a689bad8ec57
 SHA512:
-  metadata.gz: d6432b20efbd64287f86cb506f37126507de50b722b3bcd9573f84fc5568941b32ca9544aeacfff310efad75cba627ca27ab31a47083b99d29ea21518c40879f
-  data.tar.gz: 50ff9a3a5c480e9b5a414d7725a90ea543f875f7bb734a7b5b05b926c5d170b10320a86cc2d2f963d4d06125543e89d0dacacce27f5db205425e8ddd87504892
+  metadata.gz: 48e996c374ae1a5eb1778552d09642de04a6d3738cbebfce7873953b0ba88f88c193240acd81b4f306e284e10decb0aad3e72f4a0bd07f048c9dda808c6e58be
+  data.tar.gz: 878b68737b7f770714a36a1e572ad27c19675ac224715eb1b34a0b0cbfffaf3bea2f8e81116c4ecdc63a5c5b2fe466a4f9ccc461c64e5eee911e6fa2bf1fb42f

data/lib/megam/api/assembly.rb

@@ -21,5 +21,16 @@ module Megam
         body: @options[:body]
       )
    end
+
+    def upgrade_assembly(asm_id)
+      @options = { path: "/assembly/upgrade/#{asm_id}", body: '' }.merge(@options)
+
+      request(
+        expects: [200, 201],
+        method: :get,
+        body: @options[:body]
+      )
+   end
+
   end
 end

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.90"
+    VERSION = "0.91"
   end
 end

data/lib/megam/core/assembly.rb

@@ -203,10 +203,15 @@ module Megam
       asm.update
    end
 
+   def self.upgrade(params)
+     asm = from_hash(params, params['email'] || params[:email], params['api_key'] || params[:api_key], params['host'] || params[:host])
+     asm.megam_rest.upgrade_assembly(params['id'])
+   end
+
     # Create the node via the REST API
     def update
       megam_rest.update_assembly(to_hash)
-    end
+    end   
 
     def to_s
       Megam::Stuff.styled_hash(to_hash)

data/lib/megam/mixins/assembly.rb

@@ -5,9 +5,10 @@ require File.expand_path("#{File.dirname(__FILE__)}/outputs")
 module Megam
   class Mixins
     class Assembly
-      attr_reader :name, :components, :policies, :outputs, :envs, :mixins
+      attr_reader :id, :name, :components, :policies, :outputs, :envs, :mixins
       def initialize(params)
         params = Hash[params.map { |k, v| [k.to_sym, v] }]
+        @id = params[:id] || params[:assemblyID] || ''
         @name = params[:assemblyname]
         @mixins = CommonDeployable.new(params)
         @outputs = Outputs.new(params)
@@ -17,6 +18,7 @@ module Megam
 
       def to_hash
         result = @mixins.to_hash
+        result[:id] = @id if @id
         result[:name] = @name if @name
         result[:components] = @components if @components
         result[:outputs] = @outputs.to_array if @outputs

data/lib/megam/mixins/common_deployable.rb

@@ -23,8 +23,8 @@ module Megam
         @tosca_type = ''
         @status = 'launching'
         bld_toscatype(params)
-        @inputs = InputGroupData.new(params)
         set_attributes(params)
+        @inputs = InputGroupData.new(params)        
       end
 
       def to_hash

data/lib/megam/mixins/components.rb

@@ -5,10 +5,11 @@ require File.expand_path("#{File.dirname(__FILE__)}/outputs")
 module Megam
   class Mixins
     class Components
-      attr_reader :mixins, :name, :repo, :related_components, :operations, :artifacts, :envs, :outputs
+      attr_reader :mixins, :name, :repo, :related_components, :operations, :artifacts, :envs, :outputs, :id
       def initialize(params)
         @mixins = CommonDeployable.new(params)
-        @name = params[:componentname] if params[:componentname]
+        @id = params[:id] if params[:id]
+        @name = params[:componentname] || params[:name] || ''
         @outputs = Outputs.new(params)
         @operations = add_operations(params)
         @related_components = add_related_components(params)
@@ -19,6 +20,7 @@ module Megam
 
       def to_hash
         result = @mixins.to_hash
+      	result[:id] = @id if @id
         result[:name] = @name if @name
         result[:artifacts] = @artifacts if @artifacts
         result[:repo] = @repo if @repo
@@ -26,7 +28,7 @@ module Megam
         result[:outputs] = @outputs.to_array if @outputs
         result[:related_components] = @related_components if @related_components
         result[:envs] = @envs if @envs
-        result
+        result.to_hash
       end
 
       def to_a
@@ -40,14 +42,14 @@ module Megam
       end
 
       def add_related_components(params)
-        related_components = []
-        related_components << "#{params[:bind_type]}" if params.key?(:bind_type)
+        @related_components = []
+        @related_components << "#{params[:bind_type]}" if params.key?(:bind_type)
       end
 
       def add_operations(params)
-        operations = []
-        operations.push(create_operation(Operations::CI, Operations::CI_DESCRIPTON, params)) if params[:scm_name] && params[:scm_name].strip.empty?
-        operations.push(create_operation(Operations::BIND, Operations::BIND_DESCRIPTON, params)) if params.key?(:bind_type)
+        @operations = []
+        @operations.push(create_operation(Operations::CI, Operations::CI_DESCRIPTON, params)) if params[:scm_name] && params[:scm_name].strip.empty?
+        @operations.push(create_operation(Operations::BIND, Operations::BIND_DESCRIPTON, params)) if params.key?(:bind_type)
       end
 
       def create_operation(type, desc, params)
@@ -74,10 +76,10 @@ module Megam
 
       def initialize(params)
         set_attributes(params)
-        @type = params[:type]
-        @source = params[:scm_name]
-        @url = params[:source]
-        @oneclick = params[:oneclick]
+        @type = params[:type] || ""
+        @source = params[:scm_name] || ""
+        @url = params[:source] || ""
+        @oneclick = params[:oneclick] || ""
       end
 
       def tohash
@@ -97,7 +99,7 @@ module Megam
 
       CI = 'CI'.freeze
       CI_DESCRIPTON = 'always up to date code. sweet.'
-
+      NOTBOUND = "notbound".freeze
       BIND = 'bind'.freeze
       BIND_DESCRIPTON = 'bind. sweet.'
       def initialize(params, type, desc)
@@ -114,16 +116,18 @@ module Megam
       def tohash
         {   operation_type: @type,
             description: @desc,
-            properties: @prop
+            properties: @prop,
+            status: NOTBOUND
         }
       end
 
       # Key_name mismatch. Key_name is to be changed.
       def prop(params)
         op = []
-        op << { 'key' => 'type', 'value' => params[:scm_name] }
-        op << { 'key' => 'token', 'value' => params[:scmtoken] || '' }
-        op << { 'key' => 'username', 'value' => params[:scmowner] || '' }
+        op << { 'key' => 'type', 'value' => params[:scm_name] } if params.key?(:scm_name)
+        op << { 'key' => 'token', 'value' => params[:scmtoken] } if params.key?(:scmtoken)
+        op << { 'key' => 'username', 'value' => params[:scmowner] } if params.key?(:scmowner)
+        op << { 'key' => 'related_component', 'value' => params[:bind_type] } if params.key?(:bind_type)
         op
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.90'
+  version: '0.91'
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -261,36 +261,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Ruby Client for the Megam
-test_files:
-- test/mixins/test_assemblies.rb
-- test/mixins/test_assembly.rb
-- test/mixins/test_component.rb
-- test/test_accounts.rb
-- test/test_assemblies.rb
-- test/test_assembly.rb
-- test/test_availableunits.rb
-- test/test_balances.rb
-- test/test_billedhistories.rb
-- test/test_billings.rb
-- test/test_cat_requests.rb
-- test/test_components.rb
-- test/test_credithistories.rb
-- test/test_csars.rb
-- test/test_discounts.rb
-- test/test_domains.rb
-- test/test_helper.rb
-- test/test_invoices.rb
-- test/test_login.rb
-- test/test_marketplaceaddons.rb
-- test/test_marketplaces.rb
-- test/test_organizations.rb
-- test/test_predefclouds.rb
-- test/test_promos.rb
-- test/test_requests.rb
-- test/test_sensors.rb
-- test/test_sshkeys.rb
-- test/test_subscriptions.rb
+test_files: []