megam_api 0.71 → 0.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64bfe0cf1c050cdddbbc5d97056a04c628b838b1
-  data.tar.gz: 89bfebf0981483a9dbbe56fc0af7d2f98cd14ca0
+  metadata.gz: 10829b22401a59fc9bc209b0a3a107a37ab35b06
+  data.tar.gz: 79ec7f1a4bc07c1e111bef7ca3c71b2a5843f2f2
 SHA512:
-  metadata.gz: 49962356b9a6463392bbc1697e68dfb8b512aee472998518a40f55e9416ac823069143965f78049483e1fad9cf649588a70c42cb0c6a32a486a038f142071e23
-  data.tar.gz: 826a0b8ac72588fe01869d761bd6c21324758b107ff4dedc5f20f9d1eab6618f6bdc48f355c7095dba83d7e1e58f9c7fc5efe029343fc8bb4dac46a34d54b922
+  metadata.gz: feba2ff261c2964c2a51caef0c3629ba725cafaa2f5e872f9ee68596c7b5d1d7815d08de1ef9cba089b39d66e7342dbbdc43c01771ec4879cafbddc48f938828
+  data.tar.gz: d130ac562711645cd9b09d73f3d10d539328681bce844493286a4ce9c99b1fd048bd4ab89b391ed80f4a36fde23562de5c9af52ad352a1aa98e5c3a76c20e1e9

data/lib/megam/api.rb

@@ -14,7 +14,7 @@ require 'megam/api/errors'
 require 'megam/api/version'
 require 'megam/api/accounts'
 require 'megam/api/requests'
-require 'megam/api/cloud_tool_settings'
+# require 'megam/api/cloud_tool_settings'
 require 'megam/api/sshkeys'
 require 'megam/api/marketplaces'
 require 'megam/api/marketplace_addons'
@@ -45,8 +45,8 @@ require 'megam/core/error'
 require 'megam/core/account'
 require 'megam/core/request'
 require 'megam/core/request_collection'
-require 'megam/core/cloudtoolsetting'
-require 'megam/core/cloudtoolsetting_collection'
+# require 'megam/core/cloudtoolsetting'
+# require 'megam/core/cloudtoolsetting_collection'
 require 'megam/core/sshkey'
 require 'megam/core/sshkey_collection'
 require 'megam/core/marketplace'

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.71"
+    VERSION = "0.72"
   end
 end

data/lib/megam/core/assembly.rb

@@ -18,6 +18,7 @@ module Megam
   class Assembly < Megam::ServerAPI
     def initialize(email=nil, api_key=nil, host=nil)
       @id = nil
+      @asms_id = nil
       @name = nil
       @tosca_type = nil
       @components = []
@@ -43,6 +44,14 @@ module Megam
       end
     end
 
+    def asms_id(arg=nil)
+      if arg != nil
+        @asms_id = arg
+      else
+      @asms_id
+      end
+    end
+
     def name(arg=nil)
       if arg != nil
         @name = arg
@@ -50,7 +59,7 @@ module Megam
       @name
       end
     end
-    
+
     def tosca_type(arg=nil)
       if arg != nil
         @tosca_type = arg
@@ -66,7 +75,7 @@ module Megam
       @components
       end
     end
-    
+
     def requirements(arg=[])
       if arg != []
         @requirements = arg
@@ -132,6 +141,7 @@ module Megam
       index_hash = Hash.new
       index_hash["json_claz"] = self.class.name
       index_hash["id"] = id
+      index_hash["asms_id"] = asms_id
       index_hash["name"] = name
       index_hash["tosca_type"] = tosca_type
       index_hash["components"] = components
@@ -172,6 +182,7 @@ module Megam
     def self.json_create(o)
       asm = new
       asm.id(o["id"]) if o.has_key?("id")
+      asm.asms_id(o["asms_id"]) if o.has_key?("asms_id")
       asm.name(o["name"]) if o.has_key?("name")
       asm.tosca_type(o["tosca_type"]) if o.has_key?("tosca_type")
       asm.components(o["components"]) if o.has_key?("components")
@@ -193,6 +204,7 @@ module Megam
 
     def from_hash(o)
       @id                = o["id"] if o.has_key?("id")
+      @asms_id           = o["asmd_id"] if o.has_key?("asms_id")
       @name              = o["name"] if o.has_key?("name")
       @tosca_type        = o["tosca_type"] if o.has_key?("tosca_type")
       @components        = o["components"] if o.has_key?("components")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.71'
+  version: '0.72'
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -139,7 +139,6 @@ files:
 - lib/megam/api/balances.rb
 - lib/megam/api/billinghistories.rb
 - lib/megam/api/billings.rb
-- lib/megam/api/cloud_tool_settings.rb
 - lib/megam/api/components.rb
 - lib/megam/api/credithistories.rb
 - lib/megam/api/csars.rb
@@ -170,8 +169,6 @@ files:
 - lib/megam/core/billinghistories_collection.rb
 - lib/megam/core/billings.rb
 - lib/megam/core/billings_collection.rb
-- lib/megam/core/cloudtoolsetting.rb
-- lib/megam/core/cloudtoolsetting_collection.rb
 - lib/megam/core/components.rb
 - lib/megam/core/components_collection.rb
 - lib/megam/core/config.rb
@@ -215,7 +212,6 @@ files:
 - test/test_billinghistories.rb
 - test/test_billings.rb
 - test/test_cat_requests.rb
-- test/test_cloudtoolsettings.rb
 - test/test_components.rb
 - test/test_credithistories.rb
 - test/test_csars.rb
@@ -266,7 +262,6 @@ test_files:
 - test/test_billinghistories.rb
 - test/test_billings.rb
 - test/test_cat_requests.rb
-- test/test_cloudtoolsettings.rb
 - test/test_components.rb
 - test/test_credithistories.rb
 - test/test_csars.rb

data/lib/megam/api/cloud_tool_settings.rb

@@ -1,35 +0,0 @@
-module Megam
-  class API
-    def get_cloudtoolsettings
-      @options = {:path => '/cloudtoolsettings',:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    def get_cloudtoolsetting(id)
-      @options = {:path => "/cloudtoolsettings/#{id}",:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    def post_cloudtoolsetting(new_cloudtoolsetting)
-      @options = {:path => '/cloudtoolsettings/content',
-        :body => Megam::JSONCompat.to_json(new_cloudtoolsetting)}.merge(@options)
-
-      request(
-        :expects  => 201,
-        :method   => :post,
-        :body     => @options[:body]
-      )
-    end
-
-  end
-end

data/lib/megam/core/cloudtoolsetting.rb

@@ -1,217 +0,0 @@
-# Copyright:: Copyright (c) 2012, 2014 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-module Megam
-  class CloudToolSetting < Megam::ServerAPI
-    
-    def initialize(email=nil, api_key=nil, host=nil)
-      @id = nil
-      @accounts_id = nil
-      @cloud_type = nil
-      @repo_name = nil
-      @repo = nil
-      @vault_location=nil
-      @conf_location=nil
-      @created_at = nil
-      @some_msg = {}
-      super(email, api_key, host)
-    end
-
-    def cloud_tool_setting
-      self
-    end
-
-    
-    def id(arg=nil)
-      if arg != nil
-        @id = arg
-      else
-      @id
-      end
-    end
-
-    def accounts_id(arg=nil)
-      if arg != nil
-        @accounts_id= arg
-      else
-      @accounts_id
-      end
-    end
-
-    def cloud_type(arg=nil)
-      if arg != nil
-        @cloud_type = arg
-      else
-      @cloud_type
-      end
-    end
-
-    def repo_name(arg=nil)
-      if arg != nil
-        @repo_name = arg
-      else
-      @repo_name
-      end
-    end
-
-    def repo(arg=nil)
-      if arg != nil
-        @repo = arg
-      else
-      @repo
-      end
-    end
-
-    def vault_location(arg=nil)
-      if arg != nil
-        @vault_location= arg
-      else
-      @vault_location
-      end
-    end
-
-    def conf_location(arg=nil)
-      if arg != nil
-        @conf_location= arg
-      else
-      @conf_location
-      end
-    end
-
-    def created_at(arg=nil)
-      if arg != nil
-        @created_at = arg
-      else
-      @created_at
-      end
-    end
-
-    def some_msg(arg=nil)
-      if arg != nil
-        @some_msg = arg
-      else
-      @some_msg
-      end
-    end
-
-    def error?
-      crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
-    end
-
-    # Transform the ruby obj ->  to a Hash
-    def to_hash
-      index_hash = Hash.new
-      index_hash["json_claz"] = self.class.name
-      index_hash["id"] = id
-      index_hash["accounts_id"] = accounts_id
-      index_hash["cloud_type"] = cloud_type
-      index_hash["repo_name"] = repo_name
-      index_hash["repo"] = repo
-      index_hash["vault_location"] = vault_location
-      index_hash["conf_location"] = conf_location
-      index_hash["created_at"] = created_at
-      index_hash["some_msg"] = some_msg
-      index_hash
-    end
-
-    # Serialize this object as a hash: called from JsonCompat.
-    # Verify if this called from JsonCompat during testing.
-    def to_json(*a)
-      for_json.to_json(*a)
-    end
-
-    def for_json
-      result = {
-        "id" => id,
-        "accounts_id" => accounts_id,
-        "cloud_type" => cloud_type,
-        "repo" => repo,
-        "repo_name" => repo_name,
-        "vault_location" => vault_location,
-        "conf_location" => conf_location,
-        "created_at" => created_at
-      }
-      result
-    end
-
-    #
-    def self.json_create(o)
-      cts = new
-      cts.id(o["id"]) if o.has_key?("id")
-      cts.accounts_id(o["accounts_id"]) if o.has_key?("accounts_id")
-      cts.cloud_type(o["cloud_type"]) if o.has_key?("cloud_type")
-      cts.repo_name(o["repo_name"]) if o.has_key?("repo_name")
-      cts.repo(o["repo"]) if o.has_key?("repo")
-      cts.vault_location(o["vault_location"]) if o.has_key?("vault_location")
-      cts.conf_location(o["conf_location"]) if o.has_key?("conf_location")
-
-      cts.created_at(o["created_at"]) if o.has_key?("created_at")
-      #success or error
-      cts.some_msg[:code] = o["code"] if o.has_key?("code")
-      cts.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
-      cts.some_msg[:msg]= o["msg"] if o.has_key?("msg")
-      cts.some_msg[:links] = o["links"] if o.has_key?("links")
-      cts
-    end
-
-    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
-      cts = self.new(tmp_email,tmp_api_key, tmp_host)
-      cts.from_hash(o)
-      cts
-    end
-
-    def from_hash(o)
-      @id        = o[:id] if o.has_key?(:id)
-      @accounts_id = o[:accounts_id] if o.has_key?(:accounts_id)
-      @cloud_type   = o[:cloud_type] if o.has_key?(:cloud_type)
-      @repo_name     = o[:repo_name] if o.has_key?(:repo_name)
-      @repo     = o[:repo] if o.has_key?(:repo)
-      @vault_location   = o[:vault_location] if o.has_key?(:vault_location)
-      @conf_location   = o[:conf_location] if o.has_key?(:conf_location)
-      @created_at   = o[:created_at] if o.has_key?(:created_at)
-      self
-    end
-
-    def self.create(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
-      acct = from_hash(o,tmp_email, tmp_api_key, tmp_host)
-      acct.create
-    end
-
-    # Create the cloudtoolsetting via the REST API
-    def create
-      megam_rest.post_cloudtoolsetting(to_hash)
-    end
-
-    # Load all cloudtoolsettings -
-    # returns a cloudtoolsettingsCollection
-    # don't return self. check if the Megam::cloudtoolsettingCollection is returned.
-    def self.list(tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
-      cts = self.new(tmp_email, tmp_api_key, tmp_host)
-      cts.megam_rest.get_cloudtoolsettings
-    end
-
-    # Show a particular cloudtoolsetting by name,
-    # Megam::cloudtoolsetting
-    def self.show(p_name,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
-      pre = self.new(tmp_email, tmp_api_key, tmp_host)
-      pre.megam_rest.get_cloudtoolsetting(p_name)
-    end
-
-    def to_s
-      Megam::Stuff.styled_hash(to_hash)
-    end
-
-  end
-end

data/lib/megam/core/cloudtoolsetting_collection.rb

@@ -1,168 +0,0 @@
-# Copyright:: Copyright (c) 2012, 2014 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-module Megam
-  class CloudToolSettingCollection
-    include Enumerable
-
-    attr_reader :iterator
-    def initialize
-      @cloudtoolsettings = Array.new
-      @cloudtoolsettings_by_name = Hash.new
-      @insert_after_idx = nil
-    end
-
-    def all_cloudtoolsettings
-      @cloudtoolsettings
-    end
-
-    def [](index)
-      @cloudtoolsettings[index]
-    end
-
-    def []=(index, arg)
-      is_megam_cloudtoolsettings(arg)
-      @cloudtoolsettings[index] = arg
-      @cloudtoolsettings_by_name[arg.repo_name] = index
-    end
-
-    def <<(*args)
-      args.flatten.each do |a|
-        is_megam_cloudtoolsettings(a)
-        @cloudtoolsettings << a
-        @cloudtoolsettings_by_name[a.repo_name] =@cloudtoolsettings.length - 1
-      end
-      self
-    end
-
-    # 'push' is an alias method to <<
-    alias_method :push, :<<
-
-    def insert(cloudtoolsettings)
-      is_megam_cloudtoolsettings(cloudtoolsettings)
-      if @insert_after_idx
-        # in the middle of executing a run, so any cloudtoolsettings inserted now should
-        # be placed after the most recent addition done by the currently executing
-        # cloudtoolsettings
-        @cloudtoolsettings.insert(@insert_after_idx + 1, cloudtoolsettings)
-        # update name -> location mappings and register new cloudtoolsettings
-        @cloudtoolsettings_by_name.each_key do |key|
-        @cloudtoolsettings_by_name[key] += 1 if@cloudtoolsettings_by_name[key] > @insert_after_idx
-        end
-        @cloudtoolsettings_by_name[cloudtoolsettings.repo_name] = @insert_after_idx + 1
-        @insert_after_idx += 1
-      else
-      @cloudtoolsettings << cloudtoolsettings
-      @cloudtoolsettings_by_name[cloudtoolsettings.repo_name] =@cloudtoolsettings.length - 1
-      end
-    end
-
-    def each
-      @cloudtoolsettings.each do |cloudtoolsettings|
-        yield cloudtoolsettings
-      end
-    end
-
-    def each_index
-      @cloudtoolsettings.each_index do |i|
-        yield i
-      end
-    end
-
-    def empty?
-      @cloudtoolsettings.empty?
-    end
-
-    def lookup(cloudtoolsettings)
-      lookup_by = nil
-      if cloudtoolsettings.kind_of?(Megam::CloudToolSetting)
-      lookup_by = cloudtoolsettings.repo_name
-      elsif cloudtoolsettings.kind_of?(String)
-      lookup_by = cloudtoolsettings
-      else
-        raise ArgumentError, "Must pass a Megam::cloudtoolsettings or String to lookup"
-      end
-      res =@cloudtoolsettings_by_name[lookup_by]
-      unless res
-        raise ArgumentError, "Cannot find a cloudtoolsettings matching #{lookup_by} (did you define it first?)"
-      end
-      @cloudtoolsettings[res]
-    end
-
-    # Transform the ruby obj ->  to a Hash
-    def to_hash
-      index_hash = Hash.new
-      self.each do |cloudtoolsettings|
-        index_hash[cloudtoolsettings.repo_name] = cloudtoolsettings.to_s
-      end
-      index_hash
-    end
-
-    # Serialize this object as a hash: called from JsonCompat.
-    # Verify if this called from JsonCompat during testing.
-    def to_json(*a)
-      for_json.to_json(*a)
-    end
-
-=begin
-{
-"json_claz":"Megam::PredefCloudCollection",
-"results":[{
-"id":"NOD362554470640386048",
-"name":"ec2_rails",
-"account_id":"ACT362544229488001024",
-"json_claz":"Megam::PredefCloud",
-"spec":{
-"type_name":"sensor-type",
-"groups":"sens-group",
-"image":"sens-image",
-"flavor":"sens-flvr"
-},
-"access":{
-"ssh_key":"sens-ssh",
-"identity_file":"sens-identity-file",
-"ssh_user":"sens-sshuser"
-},
-"ideal":"",
-"performance":""
-}]
-}
-=end
-    def self.json_create(o)
-      collection = self.new()
-      o["results"].each do |cloudtoolsettings_list|
-        cloudtoolsettings_array = cloudtoolsettings_list.kind_of?(Array) ? cloudtoolsettings_list : [ cloudtoolsettings_list ]
-        cloudtoolsettings_array.each do |cloudtoolsettings|
-          collection.insert(cloudtoolsettings)
-        end
-      end
-      collection
-    end
-
-    private
-
-    def is_megam_cloudtoolsettings(arg)
-      unless arg.kind_of?(Megam::CloudToolSetting)
-        raise ArgumentError, "Members must be Megam::cloudtoolsetting's"
-      end
-      true
-    end
-
-    def to_s
-      Megam::Stuff.styled_hash(to_hash)
-    end
-
-  end
-end

data/test/test_cloudtoolsettings.rb

@@ -1,52 +0,0 @@
-require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
-
-class TestApps < MiniTest::Unit::TestCase
-#=begin
-  def test_post_cloudtoolsetting1
-    tmp_hash = { :cloud_type => "chef", 
-                 :repo_name => "test_chef",
-                 :repo => "https://github.com",
-                 :vault_location => "https://s3-ap-southeast-1.amazonaws.com/cloudrecipes/megam@mypaas.io/chef",
-                 :conf_location => "megam@mypaas.io/chef/chef-repo/.chef/knife.rb"  
-    }
-
-    response = megams.post_cloudtoolsetting(tmp_hash)
-    assert_equal(201, response.status)
-  end
-#=end
-=begin
-  def test_post_cloudtoolsetting2
-    tmp_hash = { :cloud_type => "chef",
-      :repo_name => "test_chef", 
-                 :repo => "https://github.com",
-                 :vault_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/megam@mypaas.io/default"  
-    }
-    response = megams.post_cloudtoolsetting(tmp_hash)
-    assert_equal(201, response.status)
-  end
-=end
-=begin
-  def test_get_cloudtoolsettings
-    response = megams.get_cloudtoolsettings
-    assert_equal(200, response.status)
-  end
-=end
-=begin
-  def test_get_cloudtoolsetting2
-    response = megams.get_cloudtoolsetting("rkspce_sundown_play")
-    assert_equal(200, response.status)
-  end
-#=begin
-  def test_get_cloudtoolsetting1
-    response = megams.get_cloudtoolsetting("iaas_default")
-    assert_equal(200, response.status)
-  end
-
-def test_get_cloudtoolsetting_not_found
-assert_raises(Megam::API::Errors::NotFound) do
-megams.get_cloudtoolsetting("stupid.megam.co")
-end
-end
-=end
-end
-