megam_api 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7866a6b120fce98ec62f3fa6345d8dde1d905ac6
-  data.tar.gz: b6561f52d4c4814cd502c17a9706fb60dc366235
+  metadata.gz: 9236e510b959dbb6435f5e138feba7cffa2f4c5d
+  data.tar.gz: 4eff4047d9a5d72f4031d529e44ac247b03a7d3c
 SHA512:
-  metadata.gz: 838f151c7f50de1dbc0366bca7813d8f289c1c69e66177367570707a2fd046eed2c11a9bebac4aa9deb7ea2288a03c645c1ec2e1a6328999d19c3676b38dc661
-  data.tar.gz: 8073706ad99d5c51d96c014cddbbb6a5d49aa83e7c180723a6bd4eb2ae00d0a0214795072a23cad73c924683a62c90491cda48d73940ca1e09070424b2b9f3a1
+  metadata.gz: 786518abd4685b0cfa9dd19725d15a4167efa02d5bd45b9a65cc58e0ed0915d5c2b9a0f1d9f5461b1ec6d9eae970b4cd949d971f71a1de2d189500e0412b0b4e
+  data.tar.gz: 5af08775fdf20fc7f2f126e02e5a78add35b6edcf7c8dcc269546d9260e04259b62eb1df1883d4356f86c93ef6733201437f820a464040090bf0004a52973ced

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "1.5.5"
+    VERSION = "1.5.6"
   end
 end

data/lib/megam/mixins/common_deployable.rb

@@ -6,9 +6,9 @@ module Megam
             include Nilavu::MegamAttributes
             attr_reader :status, :inputs, :tosca_type
 
-            DEFAULT_TOSCA_PREFIX = 'tosca'.freeze
-            # this is a mutable string, if nothing exists then we use ubuntu
-            DEFAULT_TOSCA_SUFFIX = 'ubuntu'.freeze
+              DEFAULT_VERTICE_PREFIX  = 'vertice'.freeze
+              DEFAULT_BITNAMI_PREFIX  = 'bitnami'.freeze
+              DEFAULT_DOCKER_PREFIX   = 'docker'.freeze
 
             ATTRIBUTES = [
                 :tosca_type,
@@ -37,9 +37,15 @@ module Megam
             end
 
             def bld_toscatype(params)
-                tosca_suffix = DEFAULT_TOSCA_SUFFIX
-                tosca_suffix = "#{params[:mkp_name]}" unless params[:cattype] != 'TORPEDO'.freeze
-                @tosca_type = DEFAULT_TOSCA_PREFIX + ".#{params[:cattype].downcase}.#{params[:mkp_name].downcase}" if params[:cattype] != nil  && params[:mkp_name] != nil
+                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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Ranjitha R, Rajesh Rajagopalan, Thomas Alrin,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon