megam_api 1.52.1 → 1.52.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f4868b44b3471243d6f35f4b2773fb070b4af5
-  data.tar.gz: 7b8847bce125c0ce9c4be38fdf0e7e8c2315022d
+  metadata.gz: 5b2ea5c73edfa904feb67a7421d440a3a9861ebf
+  data.tar.gz: 631d53cde48a7e687c419b806760dfda2fb8650b
 SHA512:
-  metadata.gz: b1b17c64e80d7dbfc7e80f202c3f766d30ec63037fa951d39e7801f6882c147d4150137f9d6a9bd9600fda9f9c3245a75be0787210178194aa0ca5d7d062f03a
-  data.tar.gz: 197de5554d26ea8a291ed7c197f0edf5a49f671508ec4a0cdbd4264c17b67407ed26f789f1eb7d17d977c3da5b206f9195ca7b2e9b25f1209155e60c9a286e42
+  metadata.gz: 6da36555070aaff7e7a96ea0865f1dbb31b0df6702a60530b17cad6b8cd240f8910fbbc73eb8b5ee7b2b7bb9b64afb5375efebdb4afcbd5316a3a5b51c94df3c
+  data.tar.gz: 25c872e5cf053f6c673e99ad1ca725c55b6b4bbf2e9ec5a8e8174a9cdba338a11870ea5452424cfea3ffaee460b729f06027d01d0ca7da9c147195c0867927be

data/lib/megam/api/flavors.rb

@@ -10,8 +10,8 @@ module Megam
             )
         end
 
-        def get_one_flavor(name)
-          @options = { path: "/flavors/#{name}", body: '' }.merge(@options)
+        def get_one_flavor(id)
+          @options = { path: "/flavors/#{id}", body: '' }.merge(@options)
 
           request(
             expects: 200,

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "1.52.1"
+    VERSION = "1.52.2"
   end
 end

data/lib/megam/core/flavors.rb

@@ -11,6 +11,7 @@ module Megam
             @regions = []
             @price = []
             @properties = []
+            @category = []
             @status = nil
             @created_at = nil
             @updated_at = nil
@@ -18,12 +19,12 @@ module Megam
             super(o)
         end
 
-                def flavors
-                    self
-                end
+        def flavors
+            self
+        end
 
         def id(arg = nil)
-           if arg != nil
+            if arg != nil
                 @id = arg
             else
                 @id
@@ -31,23 +32,23 @@ module Megam
         end
 
         def org_id(arg = nil)
-         if arg != nil
-          @org_id = arg
-         else
-          @org_id
-         end
+            if arg != nil
+                @org_id = arg
+            else
+                @org_id
+            end
         end
 
         def account_id(arg=nil)
-         if arg != nil
-          @account_id = arg
-         else
-          @account_id
-         end
+            if arg != nil
+                @account_id = arg
+            else
+                @account_id
+            end
         end
 
         def name(arg = nil)
-          if arg != nil
+            if arg != nil
                 @name = arg
             else
                 @name
@@ -56,7 +57,7 @@ module Megam
 
 
         def cpu(arg = nil)
-           if arg != nil
+            if arg != nil
                 @cpu = arg
             else
                 @cpu
@@ -96,13 +97,21 @@ module Megam
         end
 
         def properties(arg = [])
-           if arg != []
+            if arg != []
                 @properties = arg
             else
                 @properties
             end
         end
 
+        def category(arg = [])
+            if arg != []
+                @category = arg
+            else
+                @category
+            end
+        end
+
         def status(arg=nil)
             if arg != nil
                 @status = arg
@@ -119,7 +128,7 @@ module Megam
             end
         end
 
-         def updated_at(arg=nil)
+        def updated_at(arg=nil)
             if arg != nil
                 @updated_at = arg
             else
@@ -131,6 +140,7 @@ module Megam
             crocked = true if some_msg.key?(:msg_type) && some_msg[:msg_type] == 'error'
         end
 
+
         def some_msg(arg=nil)
             if arg != nil
                 @some_msg = arg
@@ -139,6 +149,7 @@ module Megam
             end
         end
 
+
         # Transform the ruby obj ->  to a Hash
         def to_hash
             index_hash = Hash.new
@@ -153,6 +164,7 @@ module Megam
             index_hash['regions'] = regions
             index_hash['price'] = price
             index_hash['properties'] = properties
+            index_hash['category'] = category
             index_hash['status'] = status
             index_hash['created_at'] = created_at
             index_hash['updated_at'] = updated_at
@@ -178,6 +190,7 @@ module Megam
                 'regions' => regions,
                 'price' => price,
                 'properties' => properties,
+                'category' => category,
                 'status' => status,
                 'created_at' => created_at,
                 'updated_at' => updated_at
@@ -198,6 +211,7 @@ module Megam
             fav.regions(o['regions']) if o.key?('regions')
             fav.price(o['price']) if o.key?('price')
             fav.properties(o['properties']) if o.key?('properties')
+            fav.category(o['category']) if o.key?('category')
             fav.status(o['status']) if o.key?('status')
             fav.created_at(o['created_at']) if o.key?('created_at')
             fav.updated_at(o['updated_at']) if o.key?('updated_at')
@@ -209,9 +223,9 @@ module Megam
         end
 
         def self.from_hash(o)
-            fav = self.new(o)
-            fav.from_hash(o)
-            fav
+            sps = self.new(o)
+            sps.from_hash(o)
+            sps
         end
 
         def from_hash(o)
@@ -225,23 +239,14 @@ module Megam
             @regions            = o[:regions] if o.has_key?(:regions)
             @price            = o[:price] if o.has_key?(:price)
             @properties            = o[:properties] if o.has_key?(:properties)
+            @category            = o[:category] if o.has_key?(:category)
             @status            = o[:status] if o.has_key?(:status)
             @created_at            = o[:created_at] if o.has_key?(:created_at)
             @updated_at            = o[:updated_at] if o.has_key?(:updated_at)
             self
         end
 
-
-        def self.show(params)
-            fav = self.new(params)
-            fav.megam_rest.get_one_flavor(params[:name])
-        end
-
-        def self.list(params)
-            fav = self.new(params)
-            fav.megam_rest.get_flavors
-        end
-
+        # Create the node via the REST API
         def self.create(params)
             fav = from_hash(params)
             fav.create
@@ -251,8 +256,16 @@ module Megam
             megam_rest.post_flavors(to_hash)
         end
 
-        def update
-            megam_rest.update_flavors(to_hash)
+
+
+        def self.list(params)
+            fav = self.new(params)
+            fav.megam_rest.get_flavors
+        end
+
+        def self.show(params)
+            fav = self.new(params)
+            fav.megam_rest.get_one_flavor(params[:id])
         end
 
         def self.update(params)
@@ -260,6 +273,10 @@ module Megam
             fav.update
         end
 
+        def update
+         megam_rest.update_flavors(to_hash)
+        end
+
         def self.remove(o)
             fav = from_hash(o)
             fav.remove
@@ -272,5 +289,6 @@ module Megam
         def to_s
             Megam::Stuff.styled_hash(to_hash)
         end
+
     end
 end

data/lib/megam/core/flavors_collection.rb

@@ -3,7 +3,6 @@ module Megam
         include Enumerable
 
         attr_reader :iterator
-
         def initialize
             @flavors = Array.new
             @flavors_by_name = Hash.new
@@ -21,14 +20,14 @@ module Megam
         def []=(index, arg)
             is_megam_flavors(arg)
             @flavors[index] = arg
-            @flavors_by_name[arg.name] = index
+            @flavors_by_name[arg.account_id] = index
         end
 
         def <<(*args)
             args.flatten.each do |a|
                 is_megam_flavors(a)
                 @flavors << a
-                @flavors_by_name[a.name] =@flavors.length - 1
+                @flavors_by_name[a.account_id] = @flavors.length - 1
             end
             self
         end
@@ -39,19 +38,19 @@ module Megam
         def insert(flavors)
             is_megam_flavors(flavors)
             if @insert_after_idx
-                # in the middle of executing a run, so any flavors inserted now should
+                # in the middle of executing a run, so any nodes inserted now should
                 # be placed after the most recent addition done by the currently executing
-                # flavors
+                # node
                 @flavors.insert(@insert_after_idx + 1, flavors)
-                # update name -> location mappings and register new flavors
+                # update name -> location mappings and register new node
                 @flavors_by_name.each_key do |key|
-                    @flavors_by_name[key] += 1 if@flavors_by_name[key] > @insert_after_idx
+                    @flavors_by_name[key] += 1 if @flavors_by_name[key] > @insert_after_idx
                 end
-                @flavors_by_name[flavors.name] = @insert_after_idx + 1
+                @flavors_by_name[flavors.account_id] = @insert_after_idx + 1
                 @insert_after_idx += 1
             else
                 @flavors << flavors
-                @flavors_by_name[flavors.name] =@flavors.length - 1
+                @flavors_by_name[flavors.account_id] = @flavors.length - 1
             end
         end
 
@@ -73,16 +72,16 @@ module Megam
 
         def lookup(flavors)
             lookup_by = nil
-            if flavors.kind_of?(Megam::Flavors)
-                lookup_by = flavors.name
+            if events.kind_of?(Megam::Flavors)
+                lookup_by = flavors.account_id
             elsif flavors.kind_of?(String)
                 lookup_by = flavors
             else
-                raise ArgumentError, "Must pass a Megam::flavors or String to lookup"
+                raise ArgumentError, "Must pass a Megam::Flavors or String to lookup"
             end
-            res =@flavors_by_name[lookup_by]
+            res = @flavors_by_name[lookup_by]
             unless res
-                raise ArgumentError, "Cannot find a flavors matching #{lookup_by} (did you define it first?)"
+                raise ArgumentError, "Cannot find a node matching #{lookup_by} (did you define it first?)"
             end
             @flavors[res]
         end

data/lib/megam/mixins/common_deployable.rb

@@ -35,10 +35,8 @@ module Megam
             include Nilavu::MegamAttributes
 
             attr_reader :domain, :keypairoption, :root_password, :sshkey, :provider, :cpu, :ram, :hdd,
-            :version, :display_name, :password, :region, :resource, :storage_hddtype,
-            :public_ipv4, :private_ipv4, :public_ipv6, :private_ipv6, :bitnami_username, :bitnami_password, :root_username, :backup, :backup_name, :quota_ids,
-            :vm_cpu_cost_per_hour, :vm_ram_cost_per_hour,
-            :vm_disk_cost_per_hour, :container_cpu_cost_per_hour, :container_memory_cost_per_hour,:app_username, :app_password, :user_launch_patternname
+            :version, :display_name, :password, :region, :flavor_id, :storage_hddtype,
+            :public_ipv4, :private_ipv4, :public_ipv6, :private_ipv6, :bitnami_username, :bitnami_password, :root_username, :backup, :backup_name, :quota_ids,:app_username, :app_password, :user_launch_patternname, :flavor_id
 
             ATTRIBUTES = [
                 :domain,
@@ -46,14 +44,11 @@ module Megam
                 :root_password,
                 :sshkey,
                 :provider,
-                :cpu,
-                :ram,
-                :hdd,
                 :version,
                 :display_name,
                 :password,
                 :region,
-                :resource,
+                :flavor_id,
                 :storage_hddtype,
                 :private_ipv4,
                 :public_ipv4,
@@ -67,12 +62,7 @@ module Megam
                 :backup,
                 :backup_name,
                 :quota_ids,
-		            :user_launch_patternname,
-                :vm_cpu_cost_per_hour,
-                :vm_ram_cost_per_hour,
-                :vm_disk_cost_per_hour,
-                :container_cpu_cost_per_hour,
-                :container_memory_cost_per_hour]
+		            :user_launch_patternname,]
 
             def attributes
                 ATTRIBUTES

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: 1.52.1
+  version: 1.52.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-29 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon