UCSAPI 0.0.6 → 0.0.7

data/lib/UCSAPI.rb

@@ -48,7 +48,7 @@ require 'rexml/document'
 require 'rest_client'
 require 'logger'
 require 'ostruct'
-VERSION = '0.0.6'
+VERSION = '0.0.7'
 
   #At the moment this is one big class with lots of methods.  Refactoring due later :)
   class UCSM
@@ -161,7 +161,8 @@ VERSION = '0.0.6'
     #* The caller will send a REXML object with the XMLAPI command in it
     #* Send the XMLAPI call to UCS and catch any exceptions (log and quit if we do)
     def dispatch(xml)
-      @log.info("UCSAPI::Session.dispatch sending " + xml.to_s)    
+      @log.info("dispatch starting")
+      @log.info("dispatch called with " + xml.to_s)    
 
       # The RestClient.post method expects text, not a REXML object
       post = xml.to_s
@@ -220,6 +221,7 @@ VERSION = '0.0.6'
     end
 
     #Build an XMLAPI call to find an object(s) via the class name
+    #If you supply a :inFilter hash of property/value, we'll add a filter element
     #Returns an *Array* of found objects
     #* Build the XMLAPI call from the opts parameters
     #* Send the XMLAPI object to dispatch, get an XML object back
@@ -235,7 +237,17 @@ VERSION = '0.0.6'
         request = REXML::Document.new('<configResolveClass />')
         request.root.add_attribute("inHierarchical",inHierarchical)
         request.root.add_attribute("classId",opts[:classId])
-
+        if opts[:inFilter]
+          filterHash = opts[:inFilter]
+          filterType = filterHash["type"]
+          filterProperty = filterHash["property"]
+          filterValue = filterHash["value"]
+          inFilter = request.root.add_element("inFilter")
+          inFilter.add_element(filterType, { "class" => opts[:classId], "property" => filterProperty, "value" => filterValue})
+        end
+        
+        puts request.to_s
+        
         response = dispatch(request)
 
         outConfig = response.root.elements[1]
@@ -250,7 +262,7 @@ VERSION = '0.0.6'
 
           @log.info "configResolveClass returning " + found.size.to_s + " objects"
         else
-          @log.error "configResolveClass ERROR No items found for classId = " + opts[:classId] 
+          @log.error "configResolveClass ERROR No items found for classId = " + opts[:classId] + " with filter: " + opts[:inFilter].to_s
         end
       else
         @log.error "configResolveClass ERROR Please supply a :classId option like configResolveClass( :classId => 'equipmentChassis' )" unless opts[:classId]
@@ -414,10 +426,69 @@ VERSION = '0.0.6'
         found = configResolveClass( :classId => classId)
       end
 
-      @log.info("chassis ended")
+      @log.info("blade ended")
       found
     end
 
+    #Adapter pattern method to make finding service profiles easier
+    #Returns an *Array* of found objects
+    #Logic is simple here:
+    #* You can just provide a dn, we just get that and we're done
+    #* If you provide a :name, then we treat it as a wildcard and search that field
+    #* If you provide an :org, we get all the profiles under that
+    #* If you provide only a :chassis, we get all service profiles associated to blades in that chassis
+    #* If you provide a :chassis and a :blade we get the associated service profile
+    #* If you provide a :pnDn then it's the same as :chassis and :blade
+    #* If you provide a :inFilter hash with "type", "property", and "value" in it, we'll send on the search
+    #* If you provide a :uuid we'll get that profile
+    #* If you provide a :template name, we'll get all profiles based on that template
+    #* If you provide nothing, we get all blades
+    def server(opts={})
+      @log.info("server started")
+
+      classId = 'lsServer'
+      found = Array.new
+
+      if opts[:dn] 
+        found = configResolveDn( :dn => opts[:dn] )
+      elsif opts[:name]
+        inFilter = { "type" => "wcard", "property" => "name", "value" => opts[:name] }
+        found = configResolveClass( :classId => classId, :inFilter => inFilter)
+      elsif opts[:org]
+        found = configResolveChildren( :inDn => 'org-'+opts[:org], :classId => classId )
+      elsif opts[:uuid]
+        inFilter = { "type" => "wcard", "property" => "uuid", "value" => opts[:uuid] }
+        found = configResolveClass( :classId => classId, :inFilter => inFilter)  
+      elsif opts[:template]
+        inFilter = { "type" => "wcard", "property" => "srcTemplName", "value" => opts[:template] }
+        found = configResolveClass( :classId => classId, :inFilter => inFilter)                   
+      elsif opts[:chassis]
+        if opts[:chassis] =~ /chassis-/ 
+          pnDn = opts[:chassis]
+        else 
+          pnDn = 'chassis-' + opts[:chassis] 
+        end
+        if opts[:blade]
+          pnDn << "/"
+          if opts[:blade] =~ /blade-/
+            pnDn << opts[:blade]
+          else
+            pnDn << 'blade-' + opts[:blade]
+          end
+        end   
+        inFilter = { "type" => "wcard", "property" => "pnDn", "value" => pnDn }
+        found = configResolveClass( :classId => classId, :inFilter => inFilter)   
+      elsif opts[:inFilter]
+        @log.error ":inFilter must be a hash of type, property, value" unless opts[:inFilter].class == Hash
+        found = configResolveClass( :classId => classId, :inFilter => opts[:inFilter])   
+      else
+        found = configResolveClass( :classId => classId)
+      end
+
+      @log.info("server ended")
+      found
+    end
+    
     #Adapter pattern method to make finding PSUs easier
     #Returns an *Array* of found objects
     #The logic works like this:
@@ -493,7 +564,7 @@ VERSION = '0.0.6'
               found = configResolveChildren( :classId => classId, :inDn => module_dn ) 
             end
           else
-            @log.error "UCSM.fan Missing :module parameter"
+            @log.error "Missing :module parameter"
           end
         elsif opts[:fabric] 
           fabric_dn = 'sys/switch-' + opts[:fabric].to_s

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: UCSAPI
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Steve Chambers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 +01:00
+date: 2010-10-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency