megam_api 0.17 → 0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 049495e50148060c8b58f16100dff5a6232aa63e
-  data.tar.gz: 6c3a829fd7baa2121e70eaeae72e8dce1fbbc4e9
+  metadata.gz: 6626dcb2360e7260a1bddd92c57e1845345d2356
+  data.tar.gz: 7b1c22613192558107ebf6794e39b60061183bfc
 SHA512:
-  metadata.gz: f87e02f88e6d63c5ad4fe63f40c3a67ec1842e45946ce6dedf68cf888143cbbabef538a2fbee4047c1e460eea7a9f24eda6eb8faff534d2768823b2dc17ff77d
-  data.tar.gz: 82742a4c9a346161c626e082791d15861f7b55c45a5fb1f63bdcbe3f322c59daa85bcd6d0d8cc3e092cb6f7ae29b7dcad07bf4ad8a0bfdf26a2bb937b4ac1134
+  metadata.gz: 8f631bd0d105ba5859328c7ba165749ca66916fb09ed5e9f34eefc2d7ac35b674aee9bcc195931eab2b464dc6aec04db95d2d199ee5d3bb85544c08c08b80cda
+  data.tar.gz: e01d71f735758230e7e28c9f7f2b7abe50c8c2d707414f877d8e913bc406213e974e22ae8528e17a89f57206c57a48915c2c5b464c55f31d502749cbe734931f

data/Rakefile

@@ -7,4 +7,4 @@ task :default => :test
 Rake::TestTask.new do |task|
   task.name = :test
   task.test_files = FileList['test/test*.rb']
-end
+end

data/lib/megam/api.rb

@@ -18,54 +18,30 @@ require "megam/api/errors"
 require "megam/api/version"
 require "megam/api/login"
 require "megam/api/accounts"
-require "megam/api/nodes"
-require "megam/api/appdefns"
-require "megam/api/app_request"
-require "megam/api/bolt_request"
-require "megam/api/boltdefns"
 require "megam/api/requests"
-require "megam/api/predefs"
 require "megam/api/predef_clouds"
-require "megam/api/cloud_tools"
 require "megam/api/cloud_tool_settings"
 require "megam/api/sshkeys"
 require "megam/api/marketplaces"
 require "megam/api/marketplace_addons"
+require "megam/api/organizations"
+require "megam/api/domains"
 require "megam/api/csars"
+require "megam/api/assemblies"
+
 require "megam/core/server_api"
 require "megam/core/config"
 require "megam/core/stuff"
 require "megam/core/text"
 require "megam/core/log"
 require "megam/core/json_compat"
-require "megam/builder/make_node"
-require "megam/builder/delete_node"
 require "megam/core/auth"
 require "megam/core/error"
 require "megam/core/account"
-require "megam/core/node"
-require "megam/core/appdefns"
-require "megam/core/app_request"
-require "megam/core/bolt_request"
-require "megam/core/boltdefns"
-require "megam/core/node_collection"
-require "megam/core/appdefns_collection"
-require "megam/core/app_request_collection"
-require "megam/core/bolt_request_collection"
-require "megam/core/boltdefns_collection"
 require "megam/core/request"
 require "megam/core/request_collection"
-require "megam/core/predef"
-require "megam/core/predef_collection"
 require "megam/core/predefcloud"
 require "megam/core/predefcloud_collection"
-require "megam/core/cloudtool"
-require "megam/core/cloudtool_collection"
-require "megam/core/cloudtemplate"
-require "megam/core/cloudtemplate_collection"
-require "megam/core/cloudinstruction_group"
-require "megam/core/cloudinstruction_collection"
-require "megam/core/cloudinstruction"
 require "megam/core/cloudtoolsetting"
 require "megam/core/cloudtoolsetting_collection"
 require "megam/core/sshkey"
@@ -74,11 +50,16 @@ require "megam/core/marketplace"
 require "megam/core/marketplace_collection"
 require "megam/core/marketplace_addon"
 require "megam/core/marketplace_addon_collection"
+require "megam/core/organizations"
+require "megam/core/domains"
+require "megam/core/assemblies"
+require "megam/core/assemblies_collection"
 require "megam/core/csar"
 require "megam/core/csar_collection"
 require "megam/core/konipai"
 
 
+
 module Megam
   class API
 
@@ -102,11 +83,14 @@ module Megam
 
     OPTIONS = {
       :headers => {},
-      :host => API_MEGAM_CO,
+      :host => '127.0.0.1',
       :nonblock => false,
-      :scheme => 'https'
+      :scheme => 'http'
     }
 
+    API_VERSION1 = "/v1"
+
+
 
     def text
       @text ||= Megam::Text.new(STDOUT, STDERR, STDIN, {})
@@ -210,17 +194,18 @@ module Megam
     end
 
 
-
     #Make a lazy connection.
     def connection
-      @options[:path] =API_VERSION2+ @options[:path]
+      @options[:path] =API_VERSION2 + @options[:path]
       encoded_api_header = encode_header(@options)
       @options[:headers] = HEADERS.merge({
         X_Megam_HMAC => encoded_api_header[:hmac],
         X_Megam_DATE => encoded_api_header[:date],
       }).merge(@options[:headers])
 
+ 
       if @options[:scheme] == "https"
+
       if !File.exist?(File.expand_path(File.join("#{ENV['MEGAM_HOME']}", "#{@common["api"]["pub_key"]}")))
         text.warn("Certificate file does not exist. SSL_VERIFY_PEER set as false")
         Excon.defaults[:ssl_verify_peer] = false
@@ -232,7 +217,7 @@ module Megam
       else
         Megam::Log.debug("Certificate found")
         Excon.defaults[:ssl_verify_peer] = true
-                Excon.defaults[:ssl_ca_file] = File.expand_path(File.join("#{ENV['MEGAM_HOME']}", "#{@common["api"]["pub_key"]}")) || File.expand_path(File.join(File.dirname(__FILE__), "..", "certs", "cacert.pem"))                  
+                Excon.defaults[:ssl_ca_file] = File.expand_path(File.join("#{ENV['MEGAM_HOME']}", "#{@common["api"]["pub_key"]}")) || File.expand_path(File.join(File.dirname(__FILE__), "..", "certs", "cacert.pem"))
       end
       end
 
@@ -257,7 +242,7 @@ module Megam
     # The output will have
     # :hmac
     # :date
-    # (Refer https://Github.com/indykish/megamplay.git/test/AuthenticateSpec.scala)
+    # (Refer https://github.com/indykish/megamplay.git/test/AuthenticateSpec.scala)
     def encode_header(cmd_parms)
       header_params ={}
       body_digest = OpenSSL::Digest::MD5.digest(cmd_parms[:body])
@@ -273,7 +258,7 @@ module Megam
       final_hmac = @email+':' + hash
       header_params = { :hmac => final_hmac, :date => current_date}
     end
-    
+
  end
 
 end

data/lib/megam/api/{nodes.rb → assemblies.rb}

@@ -2,8 +2,8 @@ module Megam
   class API
 
     # GET /nodes
-    def get_nodes
-      @options = {:path => '/nodes',:body => ""}.merge(@options)
+    def get_assemblies
+      @options = {:path => '/assemblies',:body => ""}.merge(@options)
 
       request(
         :expects  => 200,
@@ -12,8 +12,8 @@ module Megam
       )
     end
 
-    def get_node(node_id)
-      @options = {:path => "/nodes/#{node_id}",:body => ""}.merge(@options)
+    def get_assemblies(asm_id)
+      @options = {:path => "/assemblies/#{asm_id}",:body => ""}.merge(@options)
 
       request(
         :expects  => 200,
@@ -22,9 +22,9 @@ module Megam
       )
     end
 
-    def post_node(new_node)
-      @options = {:path => '/nodes/content',
-        :body => Megam::JSONCompat.to_json(new_node)}.merge(@options)
+    def post_assemblies(new_asm)
+      @options = {:path => '/assemblies/content',
+        :body => Megam::JSONCompat.to_json(new_asm)}.merge(@options)
 
       request(
         :expects  => 201,
@@ -35,8 +35,8 @@ module Megam
 
     #Yet to be tested
     # DELETE /nodes/:node_id
-    def delete_node(node_id)
-      @options = {:path => '/nodes/#{node_id}',
+    def delete_assemblies(asm_id)
+      @options = {:path => '/nodes/#{asm_id}',
         :body => ""}.merge(@options)
 
       request(

data/lib/megam/api/domains.rb

@@ -0,0 +1,30 @@
+module Megam
+  class API
+
+def get_domains(name)
+
+  @options = {:path => "/domains/#{name}",
+    :body => ''}.merge(@options)
+
+  request(
+    :expects  => 200,
+    :method   => :get,
+    :body     => @options[:body]
+  )
+end
+
+
+def post_domains(new_domain)
+
+      @options = {:path => '/domains/content',
+        :body =>  Megam::JSONCompat.to_json(new_domain)}.merge(@options)
+
+   
+              request(
+                :expects  => 201,
+                :method   => :post,
+                :body     => @options[:body]
+                )
+            end
+      end
+end

data/lib/megam/api/organizations.rb

@@ -0,0 +1,30 @@
+module Megam
+  class API
+
+def get_organizations(name)
+
+  @options = {:path => "/organizations/#{name}",
+    :body => ''}.merge(@options)
+
+  request(
+    :expects  => 200,
+    :method   => :get,
+    :body     => @options[:body]
+  )
+end
+
+
+def post_organizations(new_organization)
+
+      @options = {:path => '/organizations/content',
+        :body =>  Megam::JSONCompat.to_json(new_organization)}.merge(@options)
+
+
+              request(
+                :expects  => 201,
+                :method   => :post,
+                :body     => @options[:body]
+                )
+            end
+      end
+end

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.17"
+    VERSION = "0.18"
   end
 end

data/lib/megam/core/assemblies.rb

@@ -0,0 +1,180 @@
+# 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 Assemblies < Megam::ServerAPI
+    def initialize(email=nil, api_key=nil)
+      @id = nil
+      @accounts_id = nil
+      @name = nil
+      @assemblies = []
+      @assemblies_type = []
+      @inputs = {}
+      @label = nil
+      @cloudsettings = []
+      @created_at = nil
+      super(email, api_key)
+    end
+
+    def assemblies
+      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 name(arg=nil)
+      if arg != nil
+        @name = arg
+      else
+      @name
+      end
+    end
+
+    def assemblies(arg=[])
+      if arg != []
+        @assemblies = arg
+      else
+      @assemblies
+      end
+    end
+
+    
+    def inputs(arg=[])
+      if arg != []
+        @inputs = arg
+      else
+      @inputs
+      end
+    end
+
+    def created_at(arg=nil)
+      if arg != nil
+        @created_at = arg
+      else
+      @created_at
+      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["inputs"] = inputs
+      index_hash["assemblies"] = assemblies
+      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,
+        "assemblies" => assemblies,
+        "inputs" => inputs,
+        "created_at" => created_at
+      }
+      result
+    end
+
+    def self.json_create(o)
+      asm = new
+      asm.id(o["id"]) if o.has_key?("id")
+      asm.name(o["name"]) if o.has_key?("name")
+      asm.accounts_id(o["accounts_id"]) if o.has_key?("accounts_id")
+      asm.assemblies(o["assemblies"]) if o.has_key?("assemblies") #this will be an array? can hash store array?
+
+      oq = o["inputs"]    
+      asm.inputs[:id] = oq["id"] if oq && oq.has_key?("id")
+      asm.inputs[:assemblies_type] = oq["assemblies_type"] if oq && oq.has_key?("assemblies_type")
+      asm.inputs[:label] = oq["label"] if oq && oq.has_key?("label")
+      asm.inputs[:cloudsettings] = oq["cloudsettings"] if oq && oq.has_key?("cloudsettings")
+      asm.created_at(o["created_at"]) if o.has_key?("created_at")
+      asm
+    end
+
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
+      asm = self.new(tmp_email, tmp_api_key)
+      asm.from_hash(o)
+      asm
+    end
+
+    def from_hash(o)
+      @id                = o["id"] if o.has_key?("id")
+      @name              = o["name"] if o.has_key?("name")
+      @accounts_id       = o["accounts_id"] if o.has_key?("accounts_id")
+      @assemblies        = o["assemblies"] if o.has_key?("assemblies")
+      @inputs             = o["inputs"] if o.has_key?("inputs")
+      @label             = o["label"] if o.has_key?("label")
+      @created_at        = o["created_at"] if o.has_key?("created_at")
+      self
+    end
+
+    def self.create(o,tmp_email=nil, tmp_api_key=nil)
+      asm = from_hash(o, tmp_email, tmp_api_key)
+      asm.create
+    end
+
+    # Create the node via the REST API
+    def create
+      megam_rest.post_assemblies(to_hash)
+    end
+
+    # Load a account by email_p
+    def self.show(node_name, tmp_email=nil, tmp_api_key=nil)
+      asm = self.new(tmp_email, tmp_api_key)
+      asm.megam_rest.get_assemblies(node_name)
+    end
+
+    def self.list(tmp_email=nil, tmp_api_key=nil)
+      asm = self.new(tmp_email, tmp_api_key)
+      asm.megam_rest.get_assemblies
+    end
+
+    def to_s
+      Megam::Stuff.styled_hash(to_hash)
+    end
+
+  end
+end