megam_api 0.66 → 0.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5b945f249259961bea808c3a02e6de6ea9ec9e8
-  data.tar.gz: b64b704bb8ad8840111bad0360d215a6dc0294e3
+  metadata.gz: 4e00bb71803aef7d8bdb70e6bd34bb3905063198
+  data.tar.gz: 8c3ffaf027aef6644cda60ba0b3c5d5d80a78912
 SHA512:
-  metadata.gz: 0c61ab1d6fbeed1840991d11465a87af95ca4c3cf4819320d2668e6c633a4a57b1dac909c33c3cb2d6a916fca4823e823f97257d048a9dba73f8d1f754f68304
-  data.tar.gz: 42a1759ed0a1f4d6829ce445123df551f6dc733cdd35612c229fd13d827b7f03dc1fb2987dbef6e16dab3d72df17de8613310674326f8f586ef05f3c5cd19e0b
+  metadata.gz: 30100983eb3bb08b74fb597e38930d0fbd065cdcf892094ca21e80b5c2d13daf69c9c79c49df9634cbceee8663e7942d4b2ada17330ca8bbf3fb887bf159c7d9
+  data.tar.gz: acca1e4576c358f672f1275064329a0500203e2f7792391db72cea1203d78c789609ba8fbbbd271cb371dfc4f0a0b693b81b0f94966ef14f657b70f0f7f4d6e1

data/lib/megam/api.rb

@@ -14,8 +14,6 @@ require 'megam/api/errors'
 require 'megam/api/version'
 require 'megam/api/accounts'
 require 'megam/api/requests'
-require 'megam/api/cat_requests'
-require 'megam/api/predef_clouds'
 require 'megam/api/cloud_tool_settings'
 require 'megam/api/sshkeys'
 require 'megam/api/marketplaces'
@@ -47,8 +45,6 @@ require 'megam/core/error'
 require 'megam/core/account'
 require 'megam/core/request'
 require 'megam/core/request_collection'
-require 'megam/core/predefcloud'
-require 'megam/core/predefcloud_collection'
 require 'megam/core/cloudtoolsetting'
 require 'megam/core/cloudtoolsetting_collection'
 require 'megam/core/sshkey'
@@ -69,8 +65,6 @@ require 'megam/core/assembly'
 require 'megam/core/assembly_collection'
 require 'megam/core/components'
 require 'megam/core/components_collection'
-require 'megam/core/cat_requests'
-require 'megam/core/cat_requests_collection'
 require 'megam/core/event'
 
 require 'megam/core/availableunits_collection'
@@ -129,7 +123,7 @@ module Megam
     # 2. The options as passed via the instantiation of API will override global options. The ones that are passed are :email and :api_key and will
     # be  merged into a class variable @options
     # 3. Upon merge of the options, the api_key, email as available in the @options is deleted.
-    def initialize(options = {})  
+    def initialize(options = {})
       @options = OPTIONS.merge(options)
       puts @options
       @api_key = @options.delete(:api_key) || ENV['MEGAM_API_KEY']

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.66"
+    VERSION = "0.67"
   end
 end

data/lib/megam/core/json_compat.rb

@@ -36,8 +36,6 @@ module Megam
     MEGAM_BILLINGHISTORIESCOLLECTION  = "Megam::BillinghistoriesCollection".freeze
     MEGAM_BILLINGS                    = "Megam::Billings".freeze
     MEGAM_BILLINGSCOLLECTION          = "Megam::BillingsCollection".freeze
-    MEGAM_CATREQUESTS                 = "Megam::CatRequests".freeze
-    MEGAM_CATREQUESTSCOLLECTION       = "Megam::CatRequestsCollection".freeze
     MEGAM_CLOUDTOOLSETTING            = "Megam::CloudToolSetting".freeze
     MEGAM_CLOUDTOOLSETTINGCOLLECTION  = "Megam::CloudToolSettingCollection".freeze
     MEGAM_COMPONENTS                  = "Megam::Components".freeze
@@ -57,8 +55,6 @@ module Megam
     MEGAM_MARKETPLACEADDONCOLLECTION  = "Megam::MarketPlaceAddonsCollection".freeze
     MEGAM_ORGANIZATION                = "Megam::Organizations".freeze
     MEGAM_ORGANIZATIONSCOLLECTION     = "Megam::OrganizationsCollection".freeze
-    MEGAM_PREDEFCLOUD                 = "Megam::PredefCloud".freeze
-    MEGAM_PREDEFCLOUDCOLLECTION       = "Megam::PredefCloudCollection".freeze
     MEGAM_REQUEST                     = "Megam::Request".freeze
     MEGAM_REQUESTCOLLECTION           = "Megam::RequestCollection".freeze
     MEGAM_SSHKEY                      = "Megam::SshKey".freeze
@@ -166,10 +162,6 @@ module Megam
           Megam::Request
         when MEGAM_REQUESTCOLLECTION
           Megam::RequestCollection
-        when MEGAM_PREDEFCLOUD
-          Megam::PredefCloud
-        when MEGAM_PREDEFCLOUDCOLLECTION
-          Megam::PredefCloudCollection
         when MEGAM_SSHKEY
           Megam::SshKey
         when MEGAM_SSHKEYCOLLECTION
@@ -192,10 +184,6 @@ module Megam
           Megam::CSARCollection
         when MEGAM_DOMAIN
           Megam::Domains
-        when MEGAM_CATREQUESTS
-          Megam::CatRequests
-        when MEGAM_CATREQUESTSCOLLECTION
-          Megam::CatRequestsCollection
         when MEGAM_EVENT
           Megam::Event
         when MEGAM_AVAILABLEUNITS

data/lib/megam/core/request.rb

@@ -21,6 +21,8 @@ module Megam
       @name = nil
       @cattype = nil
       @command =nil
+      @action = nil
+      @category = nil
       @some_msg = {}
       @created_at = nil
       super(email, api_key, host)
@@ -30,7 +32,7 @@ module Megam
       self
     end
 
-    
+
     def id(arg=nil)
       if arg != nil
         @id = arg
@@ -61,6 +63,25 @@ module Megam
       @cattype
       end
     end
+
+    def action(arg=nil)
+      if arg != nil
+        @action = arg
+      else
+      @action
+      end
+    end
+
+
+    def category(arg=nil)
+      if arg != nil
+        @category = arg
+      else
+      @category
+      end
+    end
+
+
     def created_at(arg=nil)
       if arg != nil
         @created_at = arg
@@ -97,6 +118,8 @@ module Megam
       index_hash["cat_id"] = cat_id
       index_hash["name"] = name
       index_hash["cattype"] = cattype
+      index_hash["action"] = action
+      index_hash["category"] = category
       index_hash["command"] = command
       index_hash["created_at"] = created_at
       index_hash
@@ -114,6 +137,8 @@ module Megam
         "cat_id" => cat_id,
         "name" => name,
         "cattype" => cattype,
+        "action" => action,
+        "category" => category,
         "command" => command,
         "created_at" => created_at
       }
@@ -127,6 +152,8 @@ module Megam
       node.cat_id(o["cat_id"]) if o.has_key?("cat_id")
       node.name(o["name"]) if o.has_key?("name")
       node.cattype(o["cattype"]) if o.has_key?("cattype")
+      node.action(o["action"]) if o.has_key?("action")
+      node.category(o["category"]) if o.has_key?("category")
       node.command(o["command"]) if o.has_key?("command")
       node.created_at(o["created_at"]) if o.has_key?("created_at")
       #success or error
@@ -148,6 +175,8 @@ module Megam
       @cat_id  = o[:cat_id] if o.has_key?(:cat_id)
       @name = o[:name] if o.has_key?(:name)
       @cattype = o[:cattype] if o.has_key?(:cattype)
+      @action = o[:action] if o.has_key?(:action)
+      @category = o[:category] if o.has_key?(:category)
       @command  = o[:command] if o.has_key?(:command)
       @created_at = o[:created_at] if o.has_key?(:created_at)
       self
@@ -166,7 +195,7 @@ module Megam
       megam_rest.post_request(to_hash)
     end
 
-    
+
      def self.show(params)
       prede = self.new(params["email"] || params[:email], params["api_key"] || params[:api_key], params["host"] || params[:host])
       prede.megam_rest.get_requests

data/test/test_requests.rb

@@ -1,7 +1,7 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
-  #=begin
+=begin
   def test_get_requests
     response = megams.get_requests
     assert_equal(200, response.status)
@@ -66,19 +66,30 @@ class TestApps < MiniTest::Unit::TestCase
     "appreq" => {},
     "boltreq" => {}
   }
+=end
+
+@@tmp_hash = {
+
+"cat_id" => "ASM",
+"cattype" => "app",
+"name" => "yeshapp",
+"action" => "delete",
+"category" => "normal" #normal(create, delete), state, control, policy
+}
+
 
   def test_request_node_delete
 
     response = megams.post_request(@@tmp_hash)
     assert_equal(201, response.status)
   end
-
+=begin
   def test_request_node_stop
     @@tmp_hash["req_type"] = "stop"
     @@tmp_hash["command"]["cloudtool"]["chef"]["plugin"] = "ec2 server stop"
     response = megams.post_request(@@tmp_hash)
     assert_equal(201, response.status)
   end
-#=end
+=end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.66'
+  version: '0.67'
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -137,7 +137,6 @@ files:
 - lib/megam/api/balances.rb
 - lib/megam/api/billinghistories.rb
 - lib/megam/api/billings.rb
-- lib/megam/api/cat_requests.rb
 - lib/megam/api/cloud_tool_settings.rb
 - lib/megam/api/components.rb
 - lib/megam/api/credithistories.rb
@@ -150,7 +149,6 @@ files:
 - lib/megam/api/marketplace_addons.rb
 - lib/megam/api/marketplaces.rb
 - lib/megam/api/organizations.rb
-- lib/megam/api/predef_clouds.rb
 - lib/megam/api/promos.rb
 - lib/megam/api/requests.rb
 - lib/megam/api/sshkeys.rb
@@ -170,8 +168,6 @@ files:
 - lib/megam/core/billinghistories_collection.rb
 - lib/megam/core/billings.rb
 - lib/megam/core/billings_collection.rb
-- lib/megam/core/cat_requests.rb
-- lib/megam/core/cat_requests_collection.rb
 - lib/megam/core/cloudtoolsetting.rb
 - lib/megam/core/cloudtoolsetting_collection.rb
 - lib/megam/core/components.rb
@@ -196,8 +192,6 @@ files:
 - lib/megam/core/monologger.rb
 - lib/megam/core/organizations.rb
 - lib/megam/core/organizations_collection.rb
-- lib/megam/core/predefcloud.rb
-- lib/megam/core/predefcloud_collection.rb
 - lib/megam/core/promos.rb
 - lib/megam/core/request.rb
 - lib/megam/core/request_collection.rb

data/lib/megam/api/cat_requests.rb

@@ -1,16 +0,0 @@
-module Megam
-  class API
-
-   def post_catrequest(new_req)
-      @options = {:path => '/catrequests/content',
-        :body => Megam::JSONCompat.to_json(new_req)}.merge(@options)
-      
-      request(
-        :expects  => 201,
-        :method   => :post,
-        :body     => @options[:body]
-      )
-    end
-
-  end
-end

data/lib/megam/api/predef_clouds.rb

@@ -1,45 +0,0 @@
-module Megam
-  class API
-    def get_predefclouds
-      @options = {:path => '/predefclouds',:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    def get_predefcloud(predefcloud_name)
-      @options = {:path => "/predefclouds/#{predefcloud_name}",:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    def delete_predefcloud(predefcloud_name)
-      @options = {:path => "/predefclouds/#{predefcloud_name}",:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :delete,
-        :body     => @options[:body]
-      )
-    end
-
-    def post_predefcloud(new_predefcloud)
-      @options = {:path => '/predefclouds/content',
-        :body => Megam::JSONCompat.to_json(new_predefcloud)}.merge(@options)
-
-      request(
-        :expects  => 201,
-        :method   => :post,
-        :body     => @options[:body]
-      )
-    end
-
-  end
-end

data/lib/megam/core/cat_requests.rb

@@ -1,193 +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 CatRequests < Megam::ServerAPI
-
-    def initialize(email=nil, api_key=nil, host=nil)
-      @id = nil
-      @cat_id = nil
-      @cattype = nil
-      @name = nil
-      @action = nil
-      @category = nil
-      @some_msg = {}
-      @created_at = nil
-      super(email, api_key, host)
-    end
-
-    def cat_request
-      self
-    end
-
-
-    def id(arg=nil)
-      if arg != nil
-        @id = arg
-      else
-      @id
-      end
-    end
-
-    def cat_id(arg=nil)
-      if arg != nil
-        @cat_id = arg
-      else
-      @cat_id
-      end
-    end
-
-
-    def cattype(arg=nil)
-      if arg != nil
-        @cattype = arg
-      else
-      @cattype
-      end
-    end
-
-
-    def name(arg=nil)
-      if arg != nil
-        @name = arg
-      else
-      @name
-      end
-    end
-
-    def action(arg=nil)
-      if arg != nil
-        @action = arg
-      else
-      @action
-      end
-    end
-
-    def category(arg=nil)
-      if arg != nil
-        @category = arg
-      else
-      @category
-      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["cat_id"] = cat_id
-      index_hash["cattype"] = cattype
-      index_hash["name"] = name
-      index_hash["action"] = action
-      index_hash["category"] = category
-      index_hash["created_at"] = created_at
-      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,
-        "cat_id" => cat_id,
-        "cattype" => cattype,
-        "name" => name,
-        "action" => action,
-        "category" => category,
-        "created_at" => created_at
-      }
-      result
-    end
-
-    #
-    def self.json_create(o)
-      node = new
-      node.id(o["id"]) if o.has_key?("id")
-      node.cat_id(o["cat_id"]) if o.has_key?("cat_id")
-      node.cattype(o["cattype"]) if o.has_key?("cattype")
-      node.name(o["name"]) if o.has_key?("name")
-      node.action(o["action"]) if o.has_key?("action")
-      node.action(o["category"]) if o.has_key?("category")
-      node.created_at(o["created_at"]) if o.has_key?("created_at")
-      #success or error
-      node.some_msg[:code] = o["code"] if o.has_key?("code")
-      node.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
-      node.some_msg[:msg]= o["msg"] if o.has_key?("msg")
-      node.some_msg[:links] = o["links"] if o.has_key?("links")
-      node
-    end
-
-    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
-      node = self.new(tmp_email, tmp_api_key, tmp_host)
-      node.from_hash(o)
-      node
-    end
-
-    def from_hash(o)
-      @id = o[:id] if o.has_key?(:id)
-      @cat_id  = o[:cat_id] if o.has_key?(:cat_id)
-      @cattype  = o[:cattype] if o.has_key?(:cattype)
-      @name  = o[:name] if o.has_key?(:name)
-      @action  = o[:action] if o.has_key?(:action)
-      @category  = o[:category] if o.has_key?(:category)
-      @created_at = o[:created_at] if o.has_key?(:created_at)
-      self
-    end
-
-
-    def self.create(o)
-      acct = from_hash(o, o["email"], o["api_key"], o["host"])
-      acct.create
-    end
-
-    # Create the node via the REST API
-    def create
-      megam_rest.post_catrequest(to_hash)
-    end
-
-
-    def to_s
-      Megam::Stuff.styled_hash(to_hash)
-    end
-
-  end
-end

data/lib/megam/core/cat_requests_collection.rb

@@ -1,145 +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 CatRequestsCollection
-    include Enumerable
-
-    attr_reader :iterator
-    def initialize
-      @catrequests = Array.new
-      @catrequests_by_name = Hash.new
-      @insert_after_idx = nil
-    end
-
-    def all_requests
-      @catrequests
-    end
-
-    def [](index)
-      @catrequests[index]
-    end
-
-    def []=(index, arg)
-      is_megam_request(arg)
-      @catrequests[index] = arg
-      @catrequests_by_name[arg.cat_id] = index
-    end
-
-    def <<(*args)
-      args.flatten.each do |a|
-        is_megam_request(a)
-        @catrequests << a
-        @catrequests_by_name[a.cat_id] = @catrequests.length - 1
-      end
-      self
-    end
-
-    # 'push' is an alias method to <<
-    alias_method :push, :<<
-
-    def insert(request)
-      is_megam_request(request)
-      if @insert_after_idx
-        # in the middle of executing a run, so any requests inserted now should
-        # be placed after the most recent addition done by the currently executing
-        # request
-        @catrequests.insert(@insert_after_idx + 1, request)
-        # update name -> location mappings and register new request
-        @catrequests_by_name.each_key do |key|
-        @catrequests_by_name[key] += 1 if @catrequests_by_name[key] > @insert_after_idx
-        end
-        @catrequests_by_name[request.cat_id] = @insert_after_idx + 1
-        @insert_after_idx += 1
-      else
-      @catrequests << request
-      @catrequests_by_name[request.cat_id] = @catrequests.length - 1
-      end
-    end
-
-    def each
-      @catrequests.each do |request|
-        yield request
-      end
-    end
-
-    def each_index
-      @catrequests.each_index do |i|
-        yield i
-      end
-    end
-
-    def empty?
-      @catrequests.empty?
-    end
-
-    def lookup(request)
-      lookup_by = nil
-      if request.kind_of?(Megam::CatRequests)
-      lookup_by = request.cat_id
-      elsif request.kind_of?(String)
-      lookup_by = request
-      else
-        raise ArgumentError, "Must pass a Megam::CatRequests or String to lookup"
-      end
-      res = @catrequests_by_name[lookup_by]
-      unless res
-        raise ArgumentError, "Cannot find a request matching #{lookup_by} (did you define it first?)"
-      end
-      @catrequests[res]
-    end
-
-    # Transform the ruby obj ->  to a Hash
-    def to_hash
-      index_hash = Hash.new
-      self.each do |request|
-        index_hash[request.cat_id] = request.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
-
-
-    def self.json_create(o)
-      collection = self.new()
-      o["results"].each do |requests_list|
-        requests_array = requests_list.kind_of?(Array) ? requests_list : [ requests_list ]
-        requests_array.each do |request|
-          collection.insert(request)
-        end
-      end
-      collection
-    end
-
-    private
-
-    def is_megam_request(arg)
-      unless arg.kind_of?(Megam::CatRequests)
-        raise ArgumentError, "Members must be Megam::CatRequests's"
-      end
-      true
-    end
-
-    def to_s
-      Megam::Stuff.styled_hash(to_hash)
-    end
-
-  end
-end

data/lib/megam/core/predefcloud.rb

@@ -1,234 +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 PredefCloud < Megam::ServerAPI
-    def initialize(email=nil, api_key=nil, host=nil)
-      @id = nil
-      @name = nil
-      @accounts_id = nil
-      @spec = {}
-      @access = {}
-      #@ideal=nil
-      #@performance = nil
-      @created_at = nil
-      @some_msg = {}
-      super(email, api_key, host)
-    end
-
-    def predef_cloud
-      self
-    end
-
-    
-    def id(arg=nil)
-      if arg != nil
-        @id = arg
-      else
-      @id
-      end
-    end
-
-    def name(arg=nil)
-      if arg != nil
-        @name = arg
-      else
-      @name
-      end
-    end
-
-    def accounts_id(arg=nil)
-      if arg != nil
-        @accounts_id= arg
-      else
-      @accounts_id
-      end
-    end
-
-    def spec(arg=nil)
-      if arg != nil
-        @spec = arg
-      else
-      @spec
-      end
-    end
-
-    def access(arg=nil)
-      if arg != nil
-        @access = arg
-      else
-      @access
-      end
-    end
-
-    def ideal(arg=nil)
-      if arg != nil
-        @ideal= arg
-      else
-      @ideal
-      end
-    end
-
-    def performance(arg=nil)
-      if arg != nil
-        @performance= arg
-      else
-      @performance
-      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["name"] = name
-      index_hash["accounts_id"] = accounts_id
-      index_hash["spec"] = spec
-      index_hash["access"] = access
-     # index_hash["ideal"] = ideal
-     # index_hash["performance"] = performance
-      index_hash["created_at"] = created_at
-      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,
-        "name" => name,
-        "accounts_id" => accounts_id,
-        "spec" => spec,
-        "access" => access,
-     #   "ideal" => ideal,
-     #   "performance" => performance,
-        "created_at" => created_at
-      }
-      result
-    end
-
-    #
-    def self.json_create(o)
-      predefcd = new
-      predefcd.id(o["id"]) if o.has_key?("id")
-      predefcd.name(o["name"]) if o.has_key?("name")
-      #requests
-      oq = o["spec"]
-      predefcd.spec[:type_name] = oq["type_name"] if oq && oq.has_key?("type_name")
-      predefcd.spec[:groups] = oq["groups"] if oq && oq.has_key?("groups")
-      predefcd.spec[:image] = oq["image"] if oq && oq.has_key?("image")
-      predefcd.spec[:flavor] = oq["flavor"] if oq && oq.has_key?("flavor")
-      predefcd.spec[:tenant_id] = oq["tenant_id"] if oq && oq.has_key?("tenant_id")
-      #predef
-      op = o["access"]
-      predefcd.access[:ssh_key] = op["ssh_key"] if op && op.has_key?("ssh_key")
-      predefcd.access[:identity_file] = op["identity_file"] if op && op.has_key?("identity_file")
-      predefcd.access[:ssh_user]= op["ssh_user"] if op && op.has_key?("ssh_user")
-      predefcd.access[:vault_location]= op["vault_location"] if op && op.has_key?("vault_location")
-      predefcd.access[:sshpub_location]= op["sshpub_location"] if op && op.has_key?("sshpub_location")
-      predefcd.access[:zone]= op["zone"] if op && op.has_key?("zone")
-      predefcd.access[:region]= op["region"] if op && op.has_key?("region")
-      #access
-     # predefcd.ideal(o["ideal"]) if o.has_key?("ideal")
-     # predefcd.performance(o["performance"]) if o.has_key?("performance")
-      predefcd.created_at(o["created_at"]) if o.has_key?("created_at")
-      #success or error
-      predefcd.some_msg[:code] = o["code"] if o.has_key?("code")
-      predefcd.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
-      predefcd.some_msg[:msg]= o["msg"] if o.has_key?("msg")
-      predefcd.some_msg[:links] = o["links"] if o.has_key?("links")
-      predefcd
-    end
-
-    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
-      predefcd = self.new(tmp_email, tmp_api_key, tmp_host)
-      predefcd.from_hash(o)
-      predefcd
-    end
-
-    def from_hash(o)
-      @id        = o[:id] if o.has_key?(:id)
-      @name = o[:name] if o.has_key?(:name)
-      @spec   = o[:spec] if o.has_key?(:spec)
-      @access     = o[:access] if o.has_key?(:access)
-    #  @ideal   = o[:ideal] if o.has_key?(:ideal)
-    #  @performance   = o[:performance] if o.has_key?(:performance)
-      @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 predef via the REST API
-    def create
-      megam_rest.post_predefcloud(to_hash)
-    end
-
-    # Load all predefs -
-    # returns a PredefsCollection
-    # don't return self. check if the Megam::PredefCollection is returned.
-    def self.list(tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
-    predef = self.new(tmp_email,tmp_api_key,tmp_host)
-      predef.megam_rest.get_predefclouds
-    end
-
-    # Show a particular predef by name,
-    # Megam::Predef
-    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_predefcloud(p_name)
-    end
-
-    def self.delete(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.delete_predefcloud(p_name)
-    end
-
-    def to_s
-      Megam::Stuff.styled_hash(to_hash)
-    #"---> Megam::Account:[error=#{error?}]\n"+
-    end
-
-  end
-end

data/lib/megam/core/predefcloud_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 PredefCloudCollection
-    include Enumerable
-
-    attr_reader :iterator
-    def initialize
-      @predefclouds = Array.new
-      @predefclouds_by_name = Hash.new
-      @insert_after_idx = nil
-    end
-
-    def all_predefclouds
-      @predefclouds
-    end
-
-    def [](index)
-      @predefclouds[index]
-    end
-
-    def []=(index, arg)
-      is_megam_predefclouds(arg)
-      @predefclouds[index] = arg
-      @predefclouds_by_name[arg.name] = index
-    end
-
-    def <<(*args)
-      args.flatten.each do |a|
-        is_megam_predefclouds(a)
-        @predefclouds << a
-        @predefclouds_by_name[a.name] =@predefclouds.length - 1
-      end
-      self
-    end
-
-    # 'push' is an alias method to <<
-    alias_method :push, :<<
-
-    def insert(predefclouds)
-      is_megam_predefclouds(predefclouds)
-      if @insert_after_idx
-        # in the middle of executing a run, so any predefs inserted now should
-        # be placed after the most recent addition done by the currently executing
-        # predefclouds
-        @predefclouds.insert(@insert_after_idx + 1, predefclouds)
-        # update name -> location mappings and register new predefclouds
-        @predefclouds_by_name.each_key do |key|
-        @predefclouds_by_name[key] += 1 if@predefclouds_by_name[key] > @insert_after_idx
-        end
-        @predefclouds_by_name[predefclouds.name] = @insert_after_idx + 1
-        @insert_after_idx += 1
-      else
-      @predefclouds << predefclouds
-      @predefclouds_by_name[predefclouds.name] =@predefclouds.length - 1
-      end
-    end
-
-    def each
-      @predefclouds.each do |predefclouds|
-        yield predefclouds
-      end
-    end
-
-    def each_index
-      @predefclouds.each_index do |i|
-        yield i
-      end
-    end
-
-    def empty?
-      @predefclouds.empty?
-    end
-
-    def lookup(predefclouds)
-      lookup_by = nil
-      if predefclouds.kind_of?(Megam::PredefCloud)
-      lookup_by = predefclouds.name
-      elsif predefclouds.kind_of?(String)
-      lookup_by = predefclouds
-      else
-        raise ArgumentError, "Must pass a Megam::PredefClouds or String to lookup"
-      end
-      res =@predefclouds_by_name[lookup_by]
-      unless res
-        raise ArgumentError, "Cannot find a predefclouds matching #{lookup_by} (did you define it first?)"
-      end
-      @predefclouds[res]
-    end
-
-    # Transform the ruby obj ->  to a Hash
-    def to_hash
-      index_hash = Hash.new
-      self.each do |predefclouds|
-        index_hash[predefclouds.name] = predefclouds.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 |predefclouds_list|
-        predefclouds_array = predefclouds_list.kind_of?(Array) ? predefclouds_list : [ predefclouds_list ]
-        predefclouds_array.each do |predefclouds|
-          collection.insert(predefclouds)
-        end
-      end
-      collection
-    end
-
-    private
-
-    def is_megam_predefclouds(arg)
-      unless arg.kind_of?(Megam::PredefCloud)
-        raise ArgumentError, "Members must be Megam::PredefClouds's"
-      end
-      true
-    end
-
-    def to_s
-      Megam::Stuff.styled_hash(to_hash)
-    end
-
-  end
-end