ucslib 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0172126a4b6154c64708a1484a9b2893d11344e6
-  data.tar.gz: 36511401b59e7332222d10a8fb92559438e49ad5
+  metadata.gz: f8fd182ff6438d01a5d4fd9885e37266b80be9eb
+  data.tar.gz: 99429adb1a242bf8006e666084915d0e7433d572
 SHA512:
-  metadata.gz: b9d31b08263cbb3e164445c7cf11b624f92d7ac11b799779ad848e765af88837768aaadf55611a46742a72b3e683457a8aba11b54014da97f4729c6b633e1cc0
-  data.tar.gz: e1ec6b08d119ac16266d80a67959af5308e28e23f433c8831e9480520cac479a17a2b0cf3564dcb84829c88dbeb977d3c294ed588aec81da96fcf1f26cad81b1
+  metadata.gz: 29481c2eb690c5b5ed240d135be00a76e4928aab8619bffe056ee4c1204e5a105e138060d184c06fb26f1a8937198efbf82ef20d48e74d22ea0ab05efda6c44e
+  data.tar.gz: f2c7dd9556f984daa793aa906d1bc23d4a203e947915b00c8f4d599cac935fc999d16557d8bdfe92f731c7f1c2597841be65375309320e6f40d354096f521a2a

data/README.md

@@ -6,7 +6,12 @@ To see an example of how ucslib is being used, checkout the ucs and ucs-solo Che
 
 In addition there is a knife plugin that use ucslib as well - https://github.com/velankanisys/knife-ucs
 
-** Version 0.1.8 has been released **
+** Version 0.1.9 has been released **
+
+0.1.9
+
+Updates to allow SSL to be ignored if desired, still defaults to verify_ssl =True
+Abstracted out the Rest post call to allow for easier global changes down the road
 
 0.1.8
 
@@ -44,8 +49,8 @@ gem install ucslib
 
   [1] pry(main)> require 'ucslib'
   => true
-  [2] pry(main)> authjson = { :username => 'admin', :password => 'admin', :ip => '172.16.192.175' }.to_json
-  => "{\"username\":\"admin\",\"password\":\"admin\",\"ip\":\"172.16.192.175\"}"
+  [2] pry(main)> authjson = { :username => 'admin', :password => 'admin', :ip => '172.16.192.175', :verify_ssl => "false"}.to_json
+  => "{\"username\":\"admin\",\"password\":\"admin\",\"ip\":\"172.16.192.175\",\"verify_ssl_\":\"false\"}"
   [3] pry(main)> ucs = UCS.new(authjson)
   Your credentials are username: admin password: admin ip: 172.16.192.175 url https://172.16.192.175/nuova
   => #<UCS:0x007fd269d1eb18>

data/lib/ucslib/service/ucs/destroy.rb

@@ -36,7 +36,7 @@ module Destroy
 
 		#Post
 		begin
-			RestClient.post(@url, delete_org_XML, :content_type => 'text/xml').body
+			rest_post(delete_org_XML, @url)
 		rescue Exception => e
 			raise "Error #{e}"
 		end
@@ -64,7 +64,7 @@ module Destroy
 
 		#Post
 		begin
-			RestClient.post(@url, delete_vlan_XML, :content_type => 'text/xml').body
+			rest_post(delete_vlan_XML, @url)
 		rescue Exception => e
 			raise "Error #{e}"
 		end

data/lib/ucslib/service/ucs/inventory.rb

@@ -79,7 +79,7 @@ module Inventory
     #End Build Multi-Class XML
 
     ucs_multi_class_XML = xml_builder.to_xml.to_s
-    ucs_response_multi_class = RestClient.post(@url, ucs_multi_class_XML, :content_type => 'text/xml').body
+    ucs_response_multi_class = rest_post(ucs_multi_class_XML,@url)
 
      #Uncomment the following to create a dump to review and debug elements
      # fh = File.new("ucs_response_multiclass.xml", "w")

data/lib/ucslib/service/ucs/manage.rb

@@ -81,7 +81,7 @@ module Manage
 
 		#Post
 		begin
-			RestClient.post(@url, associate_service_profile_template_to_server_pool_xml, :content_type => 'text/xml').body
+			rest_post(associate_service_profile_template_to_server_pool_xml,@url)
 		rescue Exception => e
 			raise "Error #{e}"
 		end

data/lib/ucslib/service/ucs/provision.rb

@@ -39,7 +39,7 @@ module Provision
       #Post
 
       begin
-        RestClient.post(@url, set_org_xml, :content_type => 'text/xml').body
+        rest_post(set_org_xml,@url)
       rescue Exception => e
         raise "Error #{e}"
       end
@@ -64,7 +64,7 @@ module Provision
 
   		#Post
   		begin
-  			RestClient.post(@url, set_power_policy_xml, :content_type => 'text/xml').body
+  			rest_post(set_power_policy_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -91,7 +91,7 @@ module Provision
   		#Post
 
   		begin
-  			RestClient.post(@url, set_chassis_discovery_policy_xml, :content_type => 'text/xml').body
+  			rest_post(set_chassis_discovery_policy_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -119,7 +119,7 @@ module Provision
   		#Post
 
   		begin
-  			RestClient.post(@url, set_time_zone_xml, :content_type => 'text/xml').body
+  			rest_post(set_time_zone_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -145,7 +145,7 @@ module Provision
   		#Post
 
   		begin
-  			RestClient.post(@url, set_ntp_xml, :content_type => 'text/xml').body
+  			rest_post(set_ntp_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -175,7 +175,7 @@ module Provision
 
       #Post
       begin
-        RestClient.post(@url, set_local_disk_policy_xml, :content_type => 'text/xml').body
+        rest_post(set_local_disk_policy_xml,@url)
       rescue Exception => e
         raise "Error #{e}"
       end
@@ -204,7 +204,7 @@ module Provision
 
       #Post
       begin
-        RestClient.post(@url, set_syslog_server_xml, :content_type => 'text/xml').body
+        rest_post(set_syslog_server_xml,@url)
       rescue Exception => e
         raise "Error #{e}"
       end
@@ -238,7 +238,7 @@ module Provision
   		#Post
 
   		begin
-  			RestClient.post(@url, set_server_port_xml, :content_type => 'text/xml').body
+  			rest_post(set_server_port_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -272,7 +272,7 @@ module Provision
   		#Post
 
   		begin
-  			RestClient.post(@url, set_network_uplink_xml, :content_type => 'text/xml').body
+  			rest_post(set_network_uplink_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -302,7 +302,7 @@ module Provision
 
   		#Post
   		begin
-  			RestClient.post(@url, set_fc_uplink_xml, :content_type => 'text/xml').body
+  			rest_post(set_fc_uplink_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -345,7 +345,7 @@ module Provision
 
   		#Post
   		begin
-  			RestClient.post(@url, set_port_channel_xml, :content_type => 'text/xml').body
+  			rest_post(set_port_channel_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -380,7 +380,7 @@ module Provision
 
   		#Post
   		begin
-  			RestClient.post(@url, set_local_boot_policy_xml, :content_type => 'text/xml').body
+  			rest_post(set_local_boot_policy_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -422,7 +422,7 @@ module Provision
 
   		#Post
   		begin
-  			RestClient.post(@url, set_pxe_boot_policy_xml, :content_type => 'text/xml').body
+  			rest_post(set_pxe_boot_policy_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -468,7 +468,7 @@ module Provision
 
   		#Post
   		begin
-  			RestClient.post(@url, set_san_boot_policy_xml, :content_type => 'text/xml').body
+  			rest_post(set_san_boot_policy_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -511,7 +511,7 @@ module Provision
       #Post
 
       begin
-        RestClient.post(@url, set_mgmt_firmware_packagexml, :content_type => 'text/xml').body
+        rest_post(set_mgmt_firmware_packagexml,@url)
       rescue Exception => e
         raise "Error #{e}"
       end
@@ -574,7 +574,7 @@ module Provision
       #Post
 
       begin
-        RestClient.post(@url, set_host_firmware_packagexml, :content_type => 'text/xml').body
+        rest_post(set_host_firmware_packagexml,@url)
       rescue Exception => e
         raise "Error #{e}"
       end
@@ -604,7 +604,7 @@ module Provision
 
   		#Post
   		begin
-  			RestClient.post(@url, set_management_ip_pool_xml, :content_type => 'text/xml').body
+  			rest_post(set_management_ip_pool_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -632,7 +632,7 @@ module Provision
 
   		#Post
   		begin
-  			RestClient.post(@url, set_vlan_xml, :content_type => 'text/xml').body
+  			rest_post(set_vlan_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -677,7 +677,7 @@ module Provision
 
   		#Post
   		begin
-  			RestClient.post(@url, set_mac_pool_xml, :content_type => 'text/xml').body
+  			rest_post(set_mac_pool_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -721,7 +721,7 @@ module Provision
 
   		#Post
   		begin
-  			RestClient.post(@url, set_vnic_template_xml, :content_type => 'text/xml').body
+  			rest_post(set_vnic_template_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -751,7 +751,7 @@ module Provision
 
   		#Post
   		begin
-  			RestClient.post(@url, set_vsan_xml, :content_type => 'text/xml').body
+  			rest_post(set_vsan_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -783,7 +783,7 @@ module Provision
 
 		 #Post
 		 begin
-		 	RestClient.post(@url, set_wwnn_pool_xml, :content_type => 'text/xml').body
+		 	rest_post(set_wwnn_pool_xml,@url)
 		 rescue Exception => e
 		 	raise "Error #{e}"
 		 end
@@ -817,7 +817,7 @@ module Provision
 
 		 #Post
 		 begin
-		 	RestClient.post(@url, set_wwpn_pool_xml, :content_type => 'text/xml').body
+		 	rest_post(set_wwpn_pool_xml,@url)
 		 rescue Exception => e
 		 	raise "Error #{e}"
 		 end
@@ -853,7 +853,7 @@ module Provision
 
   		#Post
   		begin
-  			RestClient.post(@url, set_vhba_template_xml, :content_type => 'text/xml').body
+  			rest_post(set_vhba_template_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -886,7 +886,7 @@ module Provision
 
   		#Post
   		begin
-  			RestClient.post(@url, set_uuid_pool_xml, :content_type => 'text/xml').body
+  			rest_post(set_uuid_pool_xml,@url)
   		rescue Exception => e
   			raise "Error #{e}"
   		end
@@ -958,7 +958,7 @@ module Provision
 
 		 #Post create Service Profile Template
 		 begin
-		 	RestClient.post(@url, set_service_profile_template_xml, :content_type => 'text/xml').body
+		 	rest_post(set_service_profile_template_xml,@url)
 		 rescue Exception => e
 		 	raise "Error #{e}"
 		 end
@@ -986,7 +986,7 @@ module Provision
 
 		 #Post create Service Profiles from Template
 		 begin
-		 	RestClient.post(@url, set_service_profiles_from_template_xml, :content_type => 'text/xml').body
+		 	rest_post(set_service_profiles_from_template_xml,@url)
 		 rescue Exception => e
 		 	raise "Error #{e}"
 		 end
@@ -1067,7 +1067,7 @@ module Provision
 
 		#Post create Service Profiles
 		begin
-			RestClient.post(@url, set_service_profiles_xml, :content_type => 'text/xml').body
+			rest_post(set_service_profiles_xml,@url)
 		rescue Exception => e
 			raise "Error #{e}"
 		end
@@ -1126,7 +1126,7 @@ module Provision
 
       #Post
       begin
-        RestClient.post(@url, set_server_pool_xml, :content_type => 'text/xml').body
+        rest_post(set_server_pool_xml,@url)
       rescue Exception => e
         raise "Error #{e}"
       end

data/lib/ucslib/service/ucs/session.rb

@@ -65,7 +65,7 @@ module Session
         end
     aaa_refresh_xml = xml_builder.to_xml.to_s
 
-    ucs_response = RestClient.post(url, aaa_refresh_xml, :content_type => 'text/xml').body
+    ucs_response = rest_post(aaa_refresh_xml,@url)
 
 
     ucs_login_doc = Nokogiri::XML(ucs_response)
@@ -99,7 +99,7 @@ module Session
   	aaaLogoutXML = xml_builder.to_xml.to_s
 
   	begin
-  		RestClient.post(url, aaaLogoutXML, :content_type => 'text/xml').body
+  		rest_post(aaaLogoutXML,@url)
   	rescue Exception => e
   		raise "Error #{e}"
   	end

data/lib/ucslib/service/ucs/stats.rb

@@ -73,7 +73,7 @@ module Stats
         #End Build Multi-Class XML
 
         ucs_multi_class_XML = xml_builder.to_xml.to_s
-        ucs_response_multi_class = RestClient.post(url, ucs_multi_class_XML, :content_type => 'text/xml').body
+        rest_post(ucs_multi_class_XML,@url)
 
         #Uncomment the following to create a dump to review and debug elements
         # fh = File.new("ucs_response_multiclass.xml", "w")

data/lib/ucslib/service/ucs/ucs.rb

@@ -40,6 +40,8 @@ class UCS
     username = "#{JSON.parse(authjson)['username']}"
     password = "#{JSON.parse(authjson)['password']}"
     ip       = "#{JSON.parse(authjson)['ip']}"
+    #Required to default to true if verify_ssl is left out, more secure and backwards compatible
+    @verify_ssl = JSON.parse(authjson)['verify_ssl'].nil? ? true : to_boolean(JSON.parse(authjson)['verify_ssl'])
     @url      = "https://#{ip}/nuova"
 
     xml_builder = Nokogiri::XML::Builder.new do |xml|
@@ -47,7 +49,7 @@ class UCS
     end
 
     aaa_login_xml = xml_builder.to_xml.to_s
-    ucs_response = RestClient.post(@url, aaa_login_xml, :content_type => 'text/xml').body
+    ucs_response = rest_post(aaa_login_xml,@url)
     ucs_login_doc = Nokogiri::XML(ucs_response)
     ucs_login_root = ucs_login_doc.root
     @cookie = ucs_login_root.attributes['outCookie']
@@ -66,5 +68,29 @@ class UCS
     # end
 
   end
+  
+  def rest_post(payload, api_url)
+    RestClient::Request.execute(method: :post,
+      url: api_url,
+      verify_ssl: @verify_ssl,
+      payload: payload,
+      headers: {
+        content_type: 'text/xml',
+      }).body
+  end
+
+  # Generic API get call
+  #
+  # @param api_url [string] the full API URL path
+  # @return [Hash] the object converted into Hash format and can be parsed with object[0] or object['id'] notation
+  def rest_get(api_url)
+    RestClient::Request.execute(method: :get,
+      url: api_url,
+      verify_ssl: @verify_ssl).body
+  end
 
-end
+  def to_boolean(str)
+    str.to_s.downcase == "true"
+  end
+  
+end

data/lib/ucslib/service/ucs/update.rb

@@ -48,7 +48,7 @@ module Update
     #Post
 
     begin
-      RestClient.post(@url, update_host_firmware_packageXML, :content_type => 'text/xml').body
+      rest_post(update_host_firmware_packageXML,@url)
     rescue Exception => e
       raise "Error #{e}"
     end
@@ -85,7 +85,7 @@ module Update
 
     #Post Update Boot Policy on Service Profile Template
     begin
-    	RestClient.post(@url, update_boot_policy_on_service_profile_template_xml, :content_type => 'text/xml').body
+    	rest_post(update_boot_policy_on_service_profile_template_xml,@url)
     rescue Exception => e
     	raise "Error #{e}"
     end

data/lib/ucslib/version.rb

@@ -17,5 +17,5 @@
 
 
 module Ucslib
- VERSION = "0.1.8"
+ VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ucslib
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Murali Raju
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -65,7 +65,6 @@ files:
 - README.rdoc
 - Rakefile
 - lib/ucslib.rb
-- lib/ucslib/Gemfile
 - lib/ucslib/service/ucs/destroy.rb
 - lib/ucslib/service/ucs/inventory.rb
 - lib/ucslib/service/ucs/manage.rb
@@ -100,3 +99,4 @@ signing_key:
 specification_version: 4
 summary: Ruby UCS Manager Client Library
 test_files: []
+has_rdoc: 

data/lib/ucslib/Gemfile

@@ -1,4 +0,0 @@
-# A sample Gemfile
-source "https://rubygems.org"
-
-# gem "rails"