megam_api 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 548de7ae29eb0c6f8a2a40ec1f9aa570775faea1
-  data.tar.gz: 5f1388d4b34ed0f335e44543ba4bbf4fb881e64b
+  metadata.gz: 61893bc0541b6eae92badc0a4973aa3dffd4f4c4
+  data.tar.gz: 730924c194e9b92611f29232fda2c35b8378741b
 SHA512:
-  metadata.gz: d7b0745b77f482a280247c1c2c3752cb9541dcfbd563269316e2afe41f8ae8e26d16afa8fd434484f7988e1e64193955826f58b6fb185cd29a429c7378b59021
-  data.tar.gz: 453b8c1d9040998d47853792087c746a10af674950d8c4b868699de49350455d47ec1fda6f953f55c3a32888a79bc6bd48ce8a797705ce21636340730bf21588
+  metadata.gz: 726681779468ca612c7fe69dcd970f2b6a23608998af628c8f2499af62ece774f9c0f78e8f746a97d6727f4c80db9b907df94efa708fa0fed09446f25f6cc9ab
+  data.tar.gz: 5749d4401a773a3ca45bb00d8042ebcf8d41a8075d854fbf491bdd806a977b25eddbe18215efcab3d2ae80585742a3c4af6900793b81334e3b6eb4d4a6ade243

data/LICENSE

@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   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.
+

data/lib/megam/api.rb

@@ -26,9 +26,11 @@ 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/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"
@@ -58,6 +60,8 @@ 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"
 
 #we may nuke logs out of the api
 #require "megam/api/logs"
@@ -112,9 +116,9 @@ module Megam
 
     def request(params,&block)
       start = Time.now
-      text.msg "#{text.color("START", :cyan, :bold)}"
+      Megam::Log.debug("START")
       params.each do |pkey, pvalue|
-        text.msg("> #{pkey}: #{pvalue}")
+        Megam::Log.debug("> #{pkey}: #{pvalue}")
       end
 
       begin
@@ -133,47 +137,39 @@ module Megam
         end
         reerror = klass.new(error.message, error.response)
         reerror.set_backtrace(error.backtrace)
-        text.msg "#{text.color("#{reerror.response.body}", :white)}"
+        Megam::Log.error("#{reerror.response.body}")
         reerror.response.body = Megam::JSONCompat.from_json(reerror.response.body.chomp)
-        text.msg("#{text.color("RESPONSE ERR: Ruby Object", :magenta, :bold)}")
-        text.msg "#{text.color("#{reerror.response.body}", :white, :bold)}"
+        Megam::Log.debug("RESPONSE ERR: Ruby Object")
+        Megam::Log.debug("#{reerror.response.body}")
         raise(reerror)
       end
 
       @last_response = response
-      text.msg("#{text.color("RESPONSE: HTTP Status and Header Data", :magenta, :bold)}")
-      text.msg("> HTTP #{response.remote_ip} #{response.status}")
+      Megam::Log.debug("RESPONSE: HTTP Status and Header Data")
+      Megam::Log.debug("> HTTP #{response.remote_ip} #{response.status}")
 
       response.headers.each do |header, value|
-        text.msg("> #{header}: #{value}")
+        Megam::Log.debug("> #{header}: #{value}")
       end
-      text.info("End HTTP Status/Header Data.")
+      Megam::Log.debug("End HTTP Status/Header Data.")
 
       if response.body && !response.body.empty?
         if response.headers['Content-Encoding'] == 'gzip'
           response.body = Zlib::GzipReader.new(StringIO.new(response.body)).read
         end
-        text.msg("#{text.color("RESPONSE: HTTP Body(JSON)", :magenta, :bold)}")
-
-        text.msg "#{text.color("#{response.body}", :white)}"
+        Megam::Log.debug("RESPONSE: HTTP Body(JSON)")
+        Megam::Log.debug("#{response.body}")
 
         begin
           response.body = Megam::JSONCompat.from_json(response.body.chomp)
-          text.msg("#{text.color("RESPONSE: Ruby Object", :magenta, :bold)}")
-
-          text.msg "#{text.color("#{response.body}", :white, :bold)}"
+          Megam::Log.debug("RESPONSE: Ruby Object")
+          Megam::Log.debug("#{response.body}")
         rescue Exception => jsonerr
-          text.error(jsonerr)
+          Megam::Log.error(jsonerr)
           raise(jsonerr)
-        # exception = Megam::JSONCompat.from_json(response_body)
-        # msg = "HTTP Request Returned #{response.code} #{response.message}: "
-        # msg << (exception["error"].respond_to?(:join) ? exception["error"].join(", ") : exception["error"].to_s)
-        # text.error(msg)
         end
       end
-      text.msg "#{text.color("END(#{(Time.now - start).to_s}s)", :blue, :bold)}"
-      #  text.msg "#{text.color("END(#{(Megam::Stuff.time_ago(start))})", :blue, :bold)}"
-
+      Megam::Log.debug("END(#{(Time.now - start).to_s}s)")
       # reset (non-persistent) connection
       @connection.reset
       response
@@ -190,32 +186,22 @@ module Megam
         'X-Megam-Date' => encoded_api_header[:date],
       }).merge(@options[:headers])
 
-      #SSL certificate file paths
-      #If ssl_ca_path and file specified shows error
-      #Only file pass through
-      #Excon.defaults[:ssl_ca_path] = "/etc/ssl/certs"
-      #ENV['SSL_CERT_DIR'] = "/etc/ssl/certs"
       Excon.defaults[:ssl_ca_file] = File.expand_path(File.join(File.dirname(__FILE__), "..", "certs", "cacert.pem"))
-      #ENV['SSL_CERT_FILE'] = File.expand_path(File.join(File.dirname(__FILE__), "..", "certs", "cacert.pem"))
 
       if !File.exist?(File.expand_path(File.join(File.dirname(__FILE__), "..", "certs", "cacert.pem")))
         text.warn("Certificate file does not exist. SSL_VERIFY_PEER set as false")
         Excon.defaults[:ssl_verify_peer] = false
-      #elsif !File.readable_real?(File.expand_path(File.join(File.dirname(__FILE__), "..", "certs", "test.pem")))
-      #	puts "==================> Test CER 2===============>"
-      #	text.warn("Certificate file is readable. SSL_VERIFY_PEER set as false")
-      #	Excon.defaults[:ssl_verify_peer] = false
       else
-        text.info("Certificate found")
+        Megam::Log.debug("Certificate found")
         Excon.defaults[:ssl_verify_peer] = true
       end
 
-      text.info("HTTP Request Data:")
-      text.msg("> HTTP #{@options[:scheme]}://#{@options[:host]}")
+      Megam::Log.debug("HTTP Request Data:")
+      Megam::Log.debug("> HTTP #{@options[:scheme]}://#{@options[:host]}")
       @options.each do |key, value|
-        text.msg("> #{key}: #{value}")
+        Megam::Log.debug("> #{key}: #{value}")
       end
-      text.info("End HTTP Request Data.")
+      Megam::Log.debug("End HTTP Request Data.")
       @connection = Excon.new("#{@options[:scheme]}://#{@options[:host]}",@options)
     end
 

data/lib/megam/api/cloud_tool_settings.rb

@@ -0,0 +1,36 @@
+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)
+    puts "entry"
+      @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/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.7.0"
+    VERSION = "0.7.1"
   end
 end

data/lib/megam/builder/delete_node.rb

@@ -67,7 +67,8 @@ command_hash = {
 "identity_file" => "#{node.request[:command]['compute']['access']['identity_file']}",
 "ssh_user" => "",
 "vault_location" => "#{node.request[:command]['compute']['access']['vault_location']}",
-"sshpub_location" => "#{node.request[:command]['compute']['access']['sshpub_location']}"
+"sshpub_location" => "#{node.request[:command]['compute']['access']['sshpub_location']}",
+"zone" => "#{node.request[:command]['compute']['access']['zone']}"
 }
 },
 "cloudtool" => {

data/lib/megam/builder/make_node.rb

@@ -21,64 +21,64 @@ module Megam
     end
 
     def self.create(data, group, action)
-    
-       make_command = self.new()
-     begin
-      pc_collection = make_command.megam_rest.get_predefclouds
-      ct_collection = make_command.megam_rest.get_cloudtools
-      
-    rescue ArgumentError => ae
-      hash = {"msg" => ae.message, "msg_type" => "error"}
-      re = Megam::Error.from_hash(hash)
-      return re
-    rescue Megam::API::Errors::ErrorWithResponse => ewr
-      hash = {"msg" => ewr.message, "msg_type" => "error"}
-      re = Megam::Error.from_hash(hash)
-      return re
-    rescue StandardError => se
-      hash = {"msg" => se.message, "msg_type" => "error"}
-      re = Megam::Error.from_hash(hash)
+
+      make_command = self.new()
+      begin
+        pc_collection = make_command.megam_rest.get_predefclouds
+        ct_collection = make_command.megam_rest.get_cloudtools
+
+      rescue ArgumentError => ae
+        hash = {"msg" => ae.message, "msg_type" => "error"}
+        re = Megam::Error.from_hash(hash)
+        return re
+      rescue Megam::API::Errors::ErrorWithResponse => ewr
+        hash = {"msg" => ewr.message, "msg_type" => "error"}
+        re = Megam::Error.from_hash(hash)
+        return re
+      rescue StandardError => se
+        hash = {"msg" => se.message, "msg_type" => "error"}
+        re = Megam::Error.from_hash(hash)
       return re
-    end
-    
-    
-    predef_cloud = pc_collection.data[:body].lookup("#{data[:predef_cloud_name]}")
+      end
+      
+predef_cloud = pc_collection.data[:body].lookup("#{data[:predef_cloud_name]}")
 tool = ct_collection.data[:body].lookup(data[:provider])
 template = tool.cloudtemplates.lookup(predef_cloud.spec[:type_name])
 cloud_instruction = template.lookup_by_instruction(group, action)
 ci_command = cloud_instruction.command
 ci_name = cloud_instruction.name
 
-command_hash = {
-"systemprovider" => {
-"provider" => {
-"prov" => "#{data[:provider]}"
-}
-},
-"compute" => {
-"cctype" => "#{predef_cloud.spec[:type_name]}",
-"cc"=> {
-"groups" => "#{predef_cloud.spec[:groups]}",
-"image" => "#{predef_cloud.spec[:image]}",
-"flavor" => "#{predef_cloud.spec[:flavor]}"
-},
-"access" => {
-"ssh_key" => "#{predef_cloud.access[:ssh_key]}",
-"identity_file" => "#{predef_cloud.access[:identity_file]}",
-"ssh_user" => "#{predef_cloud.access[:ssh_user]}",
-"vault_location" => "#{predef_cloud.access[:vault_location]}",
-"sshpub_location" => "#{predef_cloud.access[:sshpub_location]}"
-}
-},
-"cloudtool" => {
-"chef" => {
-"command" => "#{tool.cli}",
-"plugin" => "#{template.cctype} #{ci_command}",
-"run_list" => "'role[#{data[:provider_role]}]'",
-"name" => "#{ci_name} #{data[:book_name]}"
-}
-}
-}
+      command_hash = {
+        "systemprovider" => {
+          "provider" => {
+            "prov" => "#{data[:provider]}"
+          }
+        },
+        "compute" => {
+          "cctype" => "#{predef_cloud.spec[:type_name]}",
+          "cc"=> {
+            "groups" => "#{predef_cloud.spec[:groups]}",
+            "image" => "#{predef_cloud.spec[:image]}",
+            "flavor" => "#{predef_cloud.spec[:flavor]}"
+          },
+          "access" => {
+            "ssh_key" => "#{predef_cloud.access[:ssh_key]}",
+            "identity_file" => "#{predef_cloud.access[:identity_file]}",
+            "ssh_user" => "#{predef_cloud.access[:ssh_user]}",
+            "vault_location" => "#{predef_cloud.access[:vault_location]}",
+            "sshpub_location" => "#{predef_cloud.access[:sshpub_location]}",
+            "zone" => "#{predef_cloud.access[:zone]}"
+          }
+        },
+        "cloudtool" => {
+          "chef" => {
+            "command" => "#{tool.cli}",
+            "plugin" => "#{template.cctype} #{ci_command}",
+            "run_list" => "'role[#{data[:provider_role]}]'",
+            "name" => "#{ci_name} #{data[:book_name]}"
+          }
+        }
+      }
 
       node_hash = {
         "node_name" => "#{data[:book_name]}#{data[:domain_name]}",
@@ -101,7 +101,7 @@ command_hash = {
         node_hash["boltdefns"] = {"username" => "#{data['user_name']}", "apikey" => "#{data['password']}", "store_name" => "#{data['store_db_name']}", "url" => "#{data['url']}", "prime" => "#{data['prime']}", "timetokill" => "#{data['timetokill']}", "metered" => "#{data['monitoring']}", "logging" => "#{data['logging']}", "runtime_exec" => "#{data['runtime_exec']}" }
       end
 
-node_hash
+      node_hash
     end
   end
 end