megam_api 0.81 → 0.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7466e46e439d0da4cf472e1b19dd2841efcd2eb
-  data.tar.gz: e9916130b60222949e521bf5d49ad678480b0acf
+  metadata.gz: 0aabc47d2b9470f5e1124a0ca4462c079559c02e
+  data.tar.gz: 206edc529af7e41803d383ee00155cbd70ea6bc3
 SHA512:
-  metadata.gz: 2dec71bf5241d1a3311698cf48e15cfbe20c343188993dbb1bcdd003d6a198f3850c4a59f8ec31e30869c70ee389e131277bc711ba1bab3bca630049e3781dac
-  data.tar.gz: 07bf76ee7a910c200503f130d86ac87c5aeaa786281a10964f6d4cccc9104308a735485d90d97d66703859274f3b465a3ee07f5189ff9aef3c9087c1d219fc4d
+  metadata.gz: 843a3be8d21e1fd528f1a9af2498f2d412c9b6fe3f5af8358c2251ef3b0558566f8480f1102377dd02d5aa8f9100ea42d8f0a18d22255d83b09be1ae6a846024
+  data.tar.gz: d28f35f170b43a93f4cb354019020a644c645e721200b141f14167006551d24c2b20daa9b7b185ee9e8166f2c2fa78efb00afac9924f6edf3bb43986fe69f574

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 *.rbc
 .bundle
+.project
 .config
 coverage
 Gemfile.lock

data/.project

@@ -12,6 +12,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>com.aptana.projects.webnature</nature>
 		<nature>com.aptana.ruby.core.rubynature</nature>
 	</natures>
 </projectDescription>

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.81"
+    VERSION = "0.82"
   end
 end

data/lib/megam/mixins/assemblies.rb

@@ -4,12 +4,11 @@ module Megam
   class Mixins
     class Assemblies
       attr_reader :assembly
-
       def initialize(params)
         @assembly = Assembly.new(params)
       end
 
-       def to_hash
+      def to_hash
         assembly.to_hash
       end
     end

data/lib/megam/mixins/assembly.rb

@@ -5,10 +5,10 @@ require File.expand_path("#{File.dirname(__FILE__)}/outputs")
 module Megam
   class  Mixins
     class Assembly
-      attr_reader :components, :policies, :outputs, :mixins
-
+      attr_reader :name, :components, :policies, :outputs, :mixins
       def initialize(params)
-	params = Hash[params.map{ |k, v| [k.to_sym, v] }]
+        params = Hash[params.map{ |k, v| [k.to_sym, v] }]
+        @name = params[:assemblyname]
         @mixins = CommonDeployable.new(params)
         @outputs = Outputs.new(params)
         @components = add_components(params)
@@ -17,6 +17,7 @@ module Megam
 
       def to_hash
         result = @mixins.to_hash
+        result[:name]  = @name if @name
         result[:components]  = @components if @components
         result[:outputs] = @outputs.to_array  if @outputs
         result[:policies] = @policies if @policies
@@ -24,16 +25,17 @@ module Megam
       end
 
       private
+
       # If @components_enabled for type
-      def components_enabled?
-        true # enable if its not a TORPEDO
+      def components_enabled?(params)
+        true if params[:cattype] != 'TORPEDO'.freeze
       end
 
       def add_components(params)
-        unless components_enabled?
-          @components = Components.new(params)
-	else
-	  @components = []
+        if components_enabled?(params)
+          @components = Components.new(params).to_a
+        else
+          @components = []
         end
       end
 

data/lib/megam/mixins/common_deployable.rb

@@ -4,47 +4,43 @@ module Megam
   class Mixins
     class CommonDeployable
       include Nilavu::MegamAttributes
-      attr_reader :assemblyname, :componentname, :status, :inputs, :tosca_type
+      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_TOSCA_PREFIX = 'tosca'.freeze
+      # this is a mutable string, if nothing exists then we use ubuntu
+      DEFAULT_TOSCA_SUFFIX = 'ubuntu'.freeze
 
       ATTRIBUTES = [
-        :assemblyname,
-        :componentname,
         :tosca_type,
         :status,
         :inputs]
 
-	def attributes
-		ATTRIBUTES
-	end
+      def attributes
+        ATTRIBUTES
+      end
+
       def initialize(params)
-        @assemblyname = ""
         @tosca_type = ""
         @status = "launching"
-	bld_toscatype(params)
+        bld_toscatype(params)
         @inputs = InputGroupData.new(params)
         set_attributes(params)
       end
 
-
       def to_hash
         h = {
-          :name => assemblyname,
           :status => status,
           :tosca_type => tosca_type,
-          :inputs => inputs.to_hash  
+          :inputs => inputs.to_hash
         }
       end
 
-  def bld_toscatype(mkp)
-    tosca_suffix = DEFAULT_TOSCA_SUFFIX
-    tosca_suffix = "#{mkp[:mkp_name]}" unless mkp[:cattype] != 'TORPEDO'.freeze
-    @tosca_type = DEFAULT_TOSCA_PREFIX + ".#{mkp[:cattype].downcase}.#{mkp[:mkp_name].downcase}"
-  end
- 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}"
+      end
+    end
 
     class InputGroupData
       include Nilavu::MegamAttributes
@@ -58,11 +54,11 @@ module Megam
         :hdd,
         :version,
         :display_name,
-      :password]
+        :password]
 
-	def attributes
-		ATTRIBUTES
-	end
+      def attributes
+        ATTRIBUTES
+      end
 
       def initialize(params)
         set_attributes(params)

data/lib/megam/mixins/components.rb

@@ -1,73 +1,129 @@
 require File.expand_path("#{File.dirname(__FILE__)}/megam_attributes")
+require File.expand_path("#{File.dirname(__FILE__)}/common_deployable")
+require File.expand_path("#{File.dirname(__FILE__)}/outputs")
+
 module Megam
   class Mixins
     class Components
-      attr_reader :mixins, :repo, :related_components, :operations, :artifacts
-
+      attr_reader :mixins, :name, :repo, :related_components, :operations, :artifacts, :outputs
       def initialize(params)
         @mixins = CommonDeployable.new(params)
-        @artifacts = Outputs.new(params)
-        add_repo(params)
-        add_operations(params)
-        add_related_components(params)
-        add_artifacts(params)
+        @name = params[:componentname]
+        @outputs = Outputs.new(params)
+        @operations = add_operations(params)
+        @related_components = add_related_components(params)
+        @artifacts = add_artifacts(params)
+        @repo = add_repo(params)
+      end
+
+      def to_hash
+        result = @mixins.to_hash
+        result[:name]  = @name if @name
+        result[:artifacts]  = @artifacts if @artifacts
+        result[:repo]  = @repo if @repo
+        result[:operations]  = @operations if @operations
+        result[:outputs] = @outputs.to_array  if @outputs
+        result[:related_components] = @related_components if @related_components
+        result
       end
 
+	def to_a
+		[to_hash]
+	end
+
       private
+
       def add_repo(params)
+        Repo.new(params).tohash
       end
 
       def add_related_components(params)
-        related_components = [ "#{params[:assemblyname]}.#{params[:domain]}/#{params[:componentname]}"]
+	related_components = []
+        related_components << "#{params[:assemblyname]}.#{params[:domain]}/#{params[:componentname]}" if params.key?(:bind_type)
       end
 
       def add_operations(params)
-        create_operation(Operations.CI, Operations.CI_DESCRIPTON, [:type, :token, :username])
-        create_operation(Operations.BIND, Operations.BIND_DESCRIPTON, [:type, :token, :username])
+        operations = []
+        operations.push(create_operation(Operations::CI, Operations::CI_DESCRIPTON,  params)) unless 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,properties)
-        Operations.new.add_operation(type, desc, properties)
+      def create_operation(type, desc, params)
+        Operations.new(params, type, desc).tohash
       end
 
       def add_artifacts(params)
+        Artifacts.new(params).tohash
       end
     end
 
     class Repo
-       include Nilavu::MegamAttributes
+      include Nilavu::MegamAttributes
+      attr_reader :type, :source, :url, :oneclick
       ATTRIBUTES = [
         :type,
         :source,
         :oneclick,
-      :url]
+        :url]
+
+      def attributes
+        ATTRIBUTES
+      end
 
       def initialize(params)
         set_attributes(params)
+        @type = params[:type]
+        @source = params[:scm_name]
+	@url = params[:source]
+	@oneclick = params[:oneclick]
       end
+
+      def tohash
+        {  :rtype => @type,
+          :source => @source,
+          :oneclick => @oneclick,
+          :url => @url
+        }
+      end
+
     end
 
     class Operations
       include Nilavu::MegamAttributes
+      attr_reader :type, :desc, :prop
+
       ATTRIBUTES = []
 
-      CI = "ci".freeze
+      CI = "CI".freeze
       CI_DESCRIPTON = "always up to date code. sweet."
 
-      def initialize(params)
-        set_attributes(params)
+      BIND = "bind".freeze
+      BIND_DESCRIPTON = "bind. sweet."
+      def initialize(params,type, desc)
+        @type = type
+        @desc = desc
+        #set_attributes(params)
+	@prop = prop(params)
       end
 
-      def add_operation(type, desc, properties)
-        ATTRIBUTES.merge(properties)
-        set_attributes(properties)
+      def attributes
+        ATTRIBUTES
       end
 
-      def to_hash
-        #{   'type' => 'ci',
-        #   'description' => 'Continous Integration',
-        #   'properties' => self.to_hash
+      def tohash
+        {   :operation_type => @type,
+          :description => @desc,
+          :properties => @prop
+        }
       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
+	end
     end
 
     class Artifacts
@@ -75,11 +131,22 @@ module Megam
       ATTRIBUTES = [
         :type,
         :content,
-      :requirements]
+        :requirements]
+
+      def attributes
+        ATTRIBUTES
+      end
 
       def initialize(params)
         set_attributes(params)
       end
+
+      def tohash
+        {   :artifact_type => "",
+          :content => "",
+          :requirements => []
+        }
+      end
     end
   end
 end

data/lib/megam/mixins/megam_attributes.rb

@@ -1,20 +1,18 @@
 module Nilavu
   module MegamAttributes
     ATTRIBUTES = []
-	KEY = "key".freeze
-	VALUE = "value".freeze
+    KEY = "key".freeze
+    VALUE = "value".freeze
     attr_accessor *ATTRIBUTES
+    def attributes
+      NotImplementedError
+    end
 
-	def attributes
-		NotImplementedError
-	end
     def initialize(control_data={})
       set_attributes(control_data)
     end
 
     def set_attributes(control_data)
-      #control_data.symbolize_keys!
-      #control_data = Hash[control_data.map{ |k, v| [k.to_sym, v] }]
       attributes.each { |a| instance_variable_set("@#{a}", control_data[a]) unless control_data[a].nil? }
     end
 

data/lib/megam/mixins/outputs.rb

@@ -1,24 +1,24 @@
 require File.expand_path("#{File.dirname(__FILE__)}/megam_attributes")
-module Megam
-    class Outputs
-      include Nilavu::MegamAttributes
-
-      attr_reader :nodeip, :publicip, :privateip, :lastsuccessfulupdate, :laststatus
 
-      ATTRIBUTES = [
-        ]
+module Megam
+  class Outputs
+    include Nilavu::MegamAttributes
 
-	def attributes
-		ATTRIBUTES
-	end
+    attr_reader :nodeip, :publicip, :privateip, :lastsuccessfulupdate, :laststatus
 
-      def initialize(params)
-        set_attributes(params)
-      end
+    ATTRIBUTES = [
+    ]
+    def attributes
+      ATTRIBUTES
+    end
 
-      def to_array
-        array = []
-      end
+    def initialize(params)
+      set_attributes(params)
+    end
 
+    def to_array
+      array = []
     end
+
+  end
 end

data/test/mixins/test_assemblies.rb

@@ -6,35 +6,39 @@ require 'minitest/autorun'
 require File.expand_path("#{File.dirname(__FILE__)}/../../lib/megam/mixins/assemblies")
 class TestMixinsAssemblies < MiniTest::Unit::TestCase
 
+#=begin
   def test_torpedo
     ## input the torpedo hash
     tmp_hash = {"utf8"=>"✓", "mkp_name" => "ubuntu", "cattype":"TORPEDO", "version":"14.04", "assemblyname"=>"biblical", "domain"=>"megambox.com", "ram"=>"896", "cpu"=>"0.5", "SSH_USEOLD_name"=>"tom", "SSH_NEW_name"=>"", "sshoption"=>"SSH_USEOLD", "provider"=>"one", "componentname"=>"ovid", "commit"=>" Create ", "controller"=>"marketplaces", "action"=>"create", "email"=>"8@8.com", "api_key"=>"-NQi-aSKHcmKntCsXb03jw==", "host"=>"192.168.1.105", "org_id"=>"ORG1270367691894554624", "ssh_keypair_name"=>"tom", "name"=>"tom", "path"=>"8@8.com_tom"}
-assembly_array = Megam::Mixins::Assemblies.new(tmp_hash).to_array
+
+#{"utf8"=>"✓", "version"=>"14.04", "mkp_name"=>"ubuntu", "cattype"=>"TORPEDO", "assemblyname"=>"implanting", "domain"=>"megambox.com", "ram"=>"896", "cpu"=>"0.5", "SSH_USEOLD_name"=>"tom", "SSH_NEW_name"=>"", "sshoption"=>"SSH_USEOLD", "provider"=>"one", "componentname"=>"sad", "commit"=>" Create "}
+
+
+#assemblies: [{"status"=>"launching", "tosca_type"=>"tosca.torpedo.ubuntu", "inputs"=>[{"key"=>"domain", "value"=>"megambox.com"}, {"key"=>"provider", "value"=>"one"}, {"key"=>"cpu", "value"=>"0.5"}, {"key"=>"ram", "value"=>"896"}, {"key"=>"version", "value"=>"14.04"}], "name"=>"implanting", "components"=>[], "outputs"=>[], "policies"=>[]}]
+
+
+
+assembly_array = Megam::Mixins::Assemblies.new(tmp_hash).to_hash
 puts "=========================================> END <==============================================="
 puts assembly_array.inspect
 
     #response = megams.post_billings(tmp_hash)
     #assert_equal(201, response.status)
   end
+#=end
 =begin
   def test_app_starterpack
     ## input the torpedo hash
-    tmp_hash = { :accounts_id => "ACT93476985797",
-                 :line1 => "paypal",
-                 :line2 => "#kjbh76",
-                 :country_code => "",
-                 :postal_code => "",
-                 :state => "",
-                 :phone => "",
-                 :bill_type => ""
-    }
+    tmp_hash = {"utf8"=>"✓", "version"=>"8.x", "mkp_name"=>"Java", "cattype"=>"APP", "componentname"=>"marine", "sshoption"=>"SSH_NEW", "scm_name"=>"", "type"=>"source", "provider"=>"one", "assemblyname"=>"umiak", "domain"=>"megambox.com", "ram"=>"896", "cpu"=>"0.5", "radio_app_scm"=>"starter_pack", "source"=>"https://github.com/megamsys/java-spring-petclinic.git", "check_ci"=>"true", "starterpack_git"=>"https://github.com/megamsys/java-spring-petclinic.git", "SSH_NEW_name"=>"tom", "commit"=>" Create "}
 
-    # comp_dable
-    # compare the results
-    response = megams.post_billings(tmp_hash)
-    assert_equal(201, response.status)
-  end
 
+
+    assembly_array = Megam::Mixins::Assemblies.new(tmp_hash).to_hash
+puts "=========================================> END <==============================================="
+puts assembly_array.inspect
+
+  end
+=begin
   def test_app_git
     ## input the torpedo hash
     tmp_hash = { :accounts_id => "ACT93476985797",

data/test/mixins/test_component.rb

@@ -1,56 +1,19 @@
-class TestMixinsComponent < MiniTest::Unit::TestCase
+gem 'minitest' # ensure we are using the gem version
+require 'minitest/autorun'
 
-  def test_app
-    ## input the torpedo hash
-    tmp_hash = { :accounts_id => "ACT93476985797",
-                 :line1 => "paypal",
-                 :line2 => "#kjbh76",
-                 :country_code => "",
-                 :postal_code => "",
-                 :state => "",
-                 :phone => "",
-                 :bill_type => ""
-    }
+require File.expand_path("#{File.dirname(__FILE__)}/../../lib/megam/mixins/components")
 
-    # comp_dable
-    # compare the results
-    response = megams.post_billings(tmp_hash)
-    assert_equal(201, response.status)
-  end
+class TestMixinsComponent < MiniTest::Unit::TestCase
 
-  def test_service
+  def test_app_starterpack
     ## input the torpedo hash
-    tmp_hash = { :accounts_id => "ACT93476985797",
-                 :line1 => "paypal",
-                 :line2 => "#kjbh76",
-                 :country_code => "",
-                 :postal_code => "",
-                 :state => "",
-                 :phone => "",
-                 :bill_type => ""
-    }
+    tmp_hash = {"utf8"=>"✓", "version"=>"8.x", "mkp_name"=>"Java", "cattype"=>"APP", "componentname"=>"marine", "sshoption"=>"SSH_NEW", "scm_name"=>"", "type"=>"source", "provider"=>"one", "assemblyname"=>"umiak", "domain"=>"megambox.com", "ram"=>"896", "cpu"=>"0.5", "radio_app_scm"=>"starter_pack", "source"=>"https://github.com/megamsys/java-spring-petclinic.git", "check_ci"=>"true", "starterpack_git"=>"https://github.com/megamsys/java-spring-petclinic.git", "SSH_NEW_name"=>"tom", "commit"=>" Create "}
 
-    # comp_dable
-    # compare the results
-    response = megams.post_billings(tmp_hash)
-    assert_equal(201, response.status)
-  end
-
-  def test_microservice
-    ## input the torpedo hash
-    tmp_hash = { :accounts_id => "ACT93476985797",
-                 :line1 => "paypal",
-                 :line2 => "#kjbh76",
-                 :country_code => "",
-                 :postal_code => "",
-                 :state => "",
-                 :phone => "",
-                 :bill_type => ""
-    }
+	tmp_hash = Hash[tmp_hash.map{ |k, v| [k.to_sym, v] }]
+    assembly_array = Megam::Mixins::Components.new(tmp_hash).to_hash
+puts "=========================================> END <==============================================="
+puts assembly_array.inspect
 
-    # comp_dable
-    # compare the results
-    response = megams.post_billings(tmp_hash)
-    assert_equal(201, response.status)
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.81'
+  version: '0.82'
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan,