megam_api 1.51.1 → 1.51.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2afc461d43099c104e1cd1813fdd26cff88e711
-  data.tar.gz: ca93548ae3234452ce409a6541b54a53b2bfd580
+  metadata.gz: e8108e8ffae469db22fcae29c263284f063f3dc2
+  data.tar.gz: fd581139ef609f19a59b823bc90b16e2df7f0faf
 SHA512:
-  metadata.gz: '0359c16ed5d6548b715aea6b227793cecba4926be466d89ef03f5fe7410d3efe5ed091fe4ec1b52692b3caecb33853234071aae81484532256f75bb8750cea52'
-  data.tar.gz: fb5f6d8eb09058a76ae69ee7ca53f57fa94f8c5e2b39096089e463db313b861921ef6e722227a262d4796f7201c945ded88f2ab8607ab0d7b991f1eaa2bb40a6
+  metadata.gz: b7ed44caa61e520e1799b6eb3bc13c67e0d67af81a7e1b1572c76782ade7a277f16bab424f1dd243c8501e4b643b4618a761b8849345b4bd506e139127ea4f35
+  data.tar.gz: 783517922a53d514a0b5df8630aad917f5e1be082c547c0510a4ed9ae5dce56803e773d88d1faa61a279c4fe3c47fd5085db3abca4f337df5aee7c75a4ece8e8

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "1.51.1"
+    VERSION = "1.51.2"
   end
 end

data/lib/megam/mixins/assembly.rb

@@ -6,6 +6,9 @@ module Megam
     class Mixins
         class Assembly
             attr_reader :id, :name, :components, :policies, :outputs, :envs, :mixins
+            DEFAULT_VERTICE_PREFIX  = 'vertice'.freeze
+            DEFAULT_DOCKER_PREFIX   = 'docker'.freeze
+            TORPEDO = 'TORPEDO'.freeze
             def initialize(params)
                 params = Hash[params.map { |k, v| [k.to_sym, v] }]
                 @id = params[:id] || params[:assemblyID] || ''
@@ -13,6 +16,7 @@ module Megam
                 @mixins = CommonDeployable.new(params)
                 @outputs = Outputs.new(params)
                 @components = add_components(params)
+                @tosca_type = add_assembly_tosca_type(params)
                 @policies = []
             end
 
@@ -23,6 +27,7 @@ module Megam
                 result[:components] = @components if @components
                 result[:outputs] = @outputs.to_array if @outputs
                 result[:policies] = @policies if @policies
+                result[:tosca_type] = @tosca_type if @tosca_type
                 result
             end
 
@@ -40,6 +45,15 @@ module Megam
                     @components = []
                 end
             end
+
+            def add_assembly_tosca_type(params)
+                if params[:scm_name] == DEFAULT_DOCKER_PREFIX
+                    @tosca_type = params[:scm_name] + ".#{TORPEDO.downcase}.#{params[:os_name].downcase}" if params[:os_name] != nil
+                else
+                    @tosca_type = DEFAULT_VERTICE_PREFIX + ".#{TORPEDO.downcase}.#{params[:os_name].downcase}" if params[:os_name] != nil
+                end
+            end
+
         end
     end
 end

data/lib/megam/mixins/common_deployable.rb

@@ -4,14 +4,8 @@ module Megam
     class Mixins
         class CommonDeployable
             include Nilavu::MegamAttributes
-            attr_reader :status, :state, :inputs, :tosca_type
-
-              DEFAULT_VERTICE_PREFIX  = 'vertice'.freeze
-              DEFAULT_BITNAMI_PREFIX  = 'bitnami'.freeze
-              DEFAULT_DOCKER_PREFIX   = 'docker'.freeze
-
+            attr_reader :status, :state, :inputs
             ATTRIBUTES = [
-                :tosca_type,
                 :status,
                 :state,
             :inputs]
@@ -21,10 +15,8 @@ module Megam
             end
 
             def initialize(params)
-                @tosca_type = ''
                 @status = 'initialized'
                 @state = 'initialized'
-                bld_toscatype(params)
                 set_attributes(params)
                 @inputs = InputGroupData.new(params)
 
@@ -34,22 +26,9 @@ module Megam
                 h = {
                     status: status,
                     state: state,
-                    tosca_type: tosca_type,
                     inputs: inputs.to_hash
                 }
             end
-
-            def bld_toscatype(params)
-                case params[:scm_name]
-              when DEFAULT_BITNAMI_PREFIX
-                @tosca_type = DEFAULT_BITNAMI_PREFIX + ".#{params[:cattype].downcase}.#{params[:mkp_name].downcase}" if params[:cattype] != nil  && params[:mkp_name] != nil
-              when DEFAULT_DOCKER_PREFIX
-                @tosca_type = DEFAULT_DOCKER_PREFIX + ".#{params[:cattype].downcase}.#{params[:mkp_name].downcase}" if params[:cattype] != nil  && params[:mkp_name] != nil
-              else
-                @tosca_type = DEFAULT_VERTICE_PREFIX + ".#{params[:cattype].downcase}.#{params[:mkp_name].downcase}" if params[:cattype] != nil  && params[:mkp_name] != nil
-              end
-
-            end
         end
 
         class InputGroupData
@@ -92,7 +71,7 @@ module Megam
                 :vm_ram_cost_per_hour,
                 :vm_disk_cost_per_hour,
                 :container_cpu_cost_per_hour,
-                :container_memory_cost_per_hour]
+            :container_memory_cost_per_hour]
 
             def attributes
                 ATTRIBUTES

data/lib/megam/mixins/components.rb

@@ -5,7 +5,8 @@ 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, :id
+            attr_reader :mixins, :name, :repo, :related_components, :operations, :artifacts, :envs, :outputs, :id, :tosca_type
+              DEFAULT_VERTICE_PREFIX  = 'vertice'.freeze
             def initialize(params)
                 @mixins = CommonDeployable.new(params)
                 @id = params[:id] if params[:id]
@@ -16,6 +17,7 @@ module Megam
                 @artifacts = add_artifacts(params)
                 @repo = add_repo(params)
                 @envs = params[:envs]
+                @tosca_type = add_components_tosca_type(params)
             end
 
             def to_hash
@@ -28,6 +30,7 @@ module Megam
                 result[:outputs] = @outputs.to_array if @outputs
                 result[:related_components] = @related_components if @related_components
                 result[:envs] = @envs if @envs
+                result[:tosca_type] = @tosca_type if @tosca_type
                 result.to_hash
             end
 
@@ -60,6 +63,15 @@ module Megam
             def add_artifacts(params)
                 Artifacts.new(params).tohash
             end
+
+            def add_components_tosca_type(params)
+                if params[:scm_name] !=nil
+                    @tosca_type = params[:scm_name] + ".#{params[:cattype].downcase}.#{params[:mkp_name].downcase}" if params[:cattype] != nil  && params[:mkp_name] != nil
+                else
+                    @tosca_type = DEFAULT_VERTICE_PREFIX + ".#{params[:cattype].downcase}.#{params[:mkp_name].downcase}" if params[:cattype] != nil  && params[:mkp_name] != nil
+                end
+            end
+
         end
 
         class Repo
@@ -70,7 +82,7 @@ module Megam
                 :source,
                 :oneclick,
                 :url,
-                :branch]
+            :branch]
 
             def attributes
                 ATTRIBUTES

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: 1.51.1
+  version: 1.51.2
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Ranjitha R, Vinodhini V, Rathish VBR, Rajesh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon