acirb 1.1.2.1 → 1.1.2.2

data/lib/acirb/{tlv.rb → model/tlv.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class TlvBasic < MO
     @class_name = 'tlv.Basic'

data/lib/acirb/{top.rb → model/top.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class TopInfo < MO
     @class_name = 'top.Info'

data/lib/acirb/{topoctrl.rb → model/topoctrl.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class TopoctrlEncapBlk < MO
     @class_name = 'topoctrl.EncapBlk'

data/lib/acirb/{traceroute.rb → model/traceroute.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class TracerouteAExec < MO
     @class_name = 'traceroute.AExec'

data/lib/acirb/{traceroutep.rb → model/traceroutep.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class TraceroutepRsTrDst < MO
     @class_name = 'traceroutep.RsTrDst'

data/lib/acirb/{trig.rb → model/trig.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class TrigAbsWindow < MO
     @class_name = 'trig.AbsWindow'

data/lib/acirb/{troubleshoot.rb → model/troubleshoot.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class TroubleshootEpTransition < MO
     @class_name = 'troubleshoot.EpTransition'
@@ -29,36 +29,6 @@ module ACIrb
       'epts-[' << @attributes['subj'] << ']-' << @attributes['id'] << ''
     end
   end
-  class TroubleshootReportGenStatus < MO
-    @class_name = 'troubleshoot.ReportGenStatus'
-    @ruby_class = 'TroubleshootReportGenStatus'
-    @prefix = 'reportStatus-'
-    @prefixes = [['reportStatus-', true]]
-    @rn_format = 'reportStatus-%(createTime)s'
-    @containers = ['TroubleshootSession']
-    @props = { 'childAction' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
-      'createTime' => { 'isAdmin' => true, 'isImplicit' => false, 'isCreateOnly' => true, 'isDn' => false, 'isRn' => false },
-      'dn' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => true, 'isDn' => true, 'isRn' => false },
-      'format' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
-      'include' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
-      'lcOwn' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
-      'modTs' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
-      'mode' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
-      'nodeId' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
-      'reportRequestStatus' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
-      'rn' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => true, 'isDn' => false, 'isRn' => true },
-      'sessionUrl' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
-      'status' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
-      'statusDetails' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false } }
-    @child_classes = []
-    @label = 'troubleshoot report status MO'
-    @naming_props = ['createTime']
-    @read_only = true
-
-    def rn
-      'reportStatus-' << @attributes['createTime'] << ''
-    end
-  end
   class TroubleshootReportStatus < MO
     @class_name = 'troubleshoot.ReportStatus'
     @ruby_class = 'TroubleshootReportStatus'

data/lib/acirb/{tunnel.rb → model/tunnel.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class TunnelBank < MO
     @class_name = 'tunnel.Bank'

data/lib/acirb/model/ui.rb

@@ -0,0 +1,57 @@
+# auto-generated code
+require 'acirb/mo'
+module ACIrb
+  class UiSettings < MO
+    @class_name = 'ui.Settings'
+    @ruby_class = 'UiSettings'
+    @prefix = 'uisettings'
+    @prefixes = [['uisettings', false]]
+    @rn_format = 'uisettings'
+    @containers = ['UiSettingsCont']
+    @props = { 'childAction' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
+      'descr' => { 'isAdmin' => true, 'isImplicit' => false, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
+      'dn' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => true, 'isDn' => true, 'isRn' => false },
+      'epPathLcC' => { 'isAdmin' => true, 'isImplicit' => false, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
+      'lcOwn' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
+      'modTs' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
+      'name' => { 'isAdmin' => true, 'isImplicit' => false, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
+      'ownerKey' => { 'isAdmin' => true, 'isImplicit' => false, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
+      'ownerTag' => { 'isAdmin' => true, 'isImplicit' => false, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
+      'rn' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => true, 'isDn' => false, 'isRn' => true },
+      'status' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
+      'uid' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false } }
+    @child_classes = ['FaultDelegate']
+    @label = 'UI Settings'
+    @naming_props = []
+    @read_only = false
+
+    def rn
+      'uisettings'
+    end
+  end
+  class UiSettingsCont < MO
+    @class_name = 'ui.SettingsCont'
+    @ruby_class = 'UiSettingsCont'
+    @prefix = 'uisettingscont'
+    @prefixes = [['uisettingscont', false]]
+    @rn_format = 'uisettingscont'
+    @containers = ['PolUni']
+    @props = { 'childAction' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
+      'descr' => { 'isAdmin' => true, 'isImplicit' => false, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
+      'dn' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => true, 'isDn' => true, 'isRn' => false },
+      'lcOwn' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
+      'modTs' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
+      'name' => { 'isAdmin' => true, 'isImplicit' => false, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
+      'rn' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => true, 'isDn' => false, 'isRn' => true },
+      'status' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false } }
+    @child_classes = ['UiSettings', 'FaultDelegate']
+    @label = 'UI Settings Container'
+    @naming_props = []
+    @read_only = true
+
+    def rn
+      'uisettingscont'
+    end
+  end
+
+end

data/lib/acirb/{uribv4.rb → model/uribv4.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class Uribv4Db < MO
     @class_name = 'uribv4.Db'

data/lib/acirb/{uribv6.rb → model/uribv6.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class Uribv6Db < MO
     @class_name = 'uribv6.Db'

data/lib/acirb/{viz.rb → model/viz.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class VizCounter < MO
     @class_name = 'viz.Counter'

data/lib/acirb/{vlan.rb → model/vlan.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class VlanCktEp < MO
     @class_name = 'vlan.CktEp'

data/lib/acirb/{vlanmgr.rb → model/vlanmgr.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class VlanmgrEntity < MO
     @class_name = 'vlanmgr.Entity'

data/lib/acirb/{vmm.rb → model/vmm.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class VmmAccGrpCont < MO
     @class_name = 'vmm.AccGrpCont'

data/lib/acirb/{vns.rb → model/vns.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class VnsAbsCfgRel < MO
     @class_name = 'vns.AbsCfgRel'

data/lib/acirb/{vpc.rb → model/vpc.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class VpcAppParamInfo < MO
     @class_name = 'vpc.AppParamInfo'

data/lib/acirb/{vsvc.rb → model/vsvc.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class VsvcAConsLbl < MO
     @class_name = 'vsvc.AConsLbl'

data/lib/acirb/{vtap.rb → model/vtap.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class VtapNatEntry < MO
     @class_name = 'vtap.NatEntry'

data/lib/acirb/{vxlan.rb → model/vxlan.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class VxlanCktEp < MO
     @class_name = 'vxlan.CktEp'

data/lib/acirb/{vz.rb → model/vz.rb}

@@ -1,5 +1,5 @@
 # auto-generated code
-require 'mo'
+require 'acirb/mo'
 module ACIrb
   class VzABrCP < MO
     @class_name = 'vz.ABrCP'

data/lib/acirb/naming.rb

@@ -1,48 +1,124 @@
-# auto-generated code
-require 'mo'
 module ACIrb
-  class NamingNamedIdentifiedObject < MO
-    @class_name = 'naming.NamedIdentifiedObject'
-    @ruby_class = 'NamingNamedIdentifiedObject'
-    @prefix = ''
-    @prefixes = []
-    @rn_format = ''
-    @containers = []
-    @props = { 'childAction' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
-      'dn' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => true, 'isDn' => true, 'isRn' => false },
-      'id' => { 'isAdmin' => true, 'isImplicit' => false, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
-      'name' => { 'isAdmin' => true, 'isImplicit' => false, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
-      'rn' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => true, 'isDn' => false, 'isRn' => true },
-      'status' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false } }
-    @child_classes = []
-    @label = 'None'
-    @naming_props = []
-    @read_only = false
-
-    def rn
-      ''
+  class Naming
+    def self.split_outside_brackets(dn_str, splitChar)
+      depth = 0
+      place = 0
+      last_split = 0
+      pieces = []
+      while place < dn_str.length
+        c = dn_str[place]
+        if c == '['
+          depth += 1
+        elsif c == ']'
+          depth -= 1
+        end
+        if depth == 0 && c == splitChar && place != 0
+          pieces.push(dn_str[last_split..place])
+          last_split = place + 1
+        end
+        place += 1
+      end
+      pieces.push(dn_str[last_split..place - 1]) if place != last_split
+
+      pieces
     end
-  end
-  class NamingNamedObject < MO
-    @class_name = 'naming.NamedObject'
-    @ruby_class = 'NamingNamedObject'
-    @prefix = ''
-    @prefixes = []
-    @rn_format = ''
-    @containers = []
-    @props = { 'childAction' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
-      'dn' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => true, 'isDn' => true, 'isRn' => false },
-      'name' => { 'isAdmin' => true, 'isImplicit' => false, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false },
-      'rn' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => true, 'isDn' => false, 'isRn' => true },
-      'status' => { 'isAdmin' => true, 'isImplicit' => true, 'isCreateOnly' => false, 'isDn' => false, 'isRn' => false } }
-    @child_classes = []
-    @label = 'None'
-    @naming_props = []
-    @read_only = false
-
-    def rn
-      ''
+
+    def self.strip_last_delimiter(str, delim)
+      if str[-1] == delim
+        return str[0..-2]
+      else
+        return str
+      end
+    end
+
+    def self.strip_outer_brackets(str)
+      if str[0] == '[' && str[-1] == ']'
+        return str[1..-2]
+      else
+        return str
+      end
+    end
+
+    def self.split_dn_str(dn_str)
+      rns = []
+      split_outside_brackets(dn_str, '/').each do |rn|
+        rns.push(strip_last_delimiter(rn, '/'))
+      end
+      rns
+    end
+
+    def self.split_rn_str(rn_str, delims)
+      rn_pieces = []
+      delims.each_with_index do |(delim, _has_prop), index|
+        begin_delim = rn_str.split(delim)
+
+        if index == delims.length - 1
+          name_prop = begin_delim[1]
+        else
+          rn_str = begin_delim[1]
+          end_delim = rn_str.split(delims[index + 1][0])
+          name_prop = end_delim[0]
+        end
+
+        rn_pieces.push(delim)
+        rn_pieces.push(name_prop)
+      end
+      rn_pieces
     end
-  end
 
+    def self.get_mo_from_dn(dn_str)
+      rns = split_dn_str(dn_str)
+      mo = ACIrb::TopRoot.new(nil)
+      rns.each do |rn|
+        mo = get_mo_from_rn(mo, rn)
+      end
+      mo
+    end
+
+    def self.get_mo_from_rn(parent_mo, rn_str)
+      mo = get_class_from_child_prefix(parent_mo, rn_str).new(parent_mo)
+      return mo if mo.naming_props.length == 0
+      rn_pieces = split_rn_str(rn_str, mo.prefixes)
+      rn_values = rn_pieces.values_at(*(1..rn_pieces.length - 1).step(2))
+      mo.naming_props.each_with_index do |prop_name, index|
+        prop_val = rn_values[index]
+        mo.set_prop(prop_name.to_s, strip_outer_brackets(prop_val))
+      end
+      mo
+    end
+
+    def self.match_prefix_in_list(rn_str, prefix_list)
+      matches = false
+      prefix_match = ''
+      prefix_list.each do |prefix|
+        if rn_str.start_with?(prefix)
+          matches = true
+          prefix_match = prefix
+          break
+        end
+      end
+
+      return prefix_match if matches
+
+      nil
+    end
+
+    def self.get_class_from_child_prefix(parent_mo, rn_str)
+      prefix_to_class = {}
+      parent_mo.child_classes.each do |c|
+        cls = ACIrb.const_get(c)
+        prefix_to_class[cls.prefix] = cls
+      end
+
+      lpm = prefix_to_class.keys.sort_by { |x| -1 * x.length }
+      prefix_match = match_prefix_in_list(rn_str, lpm)
+
+      if prefix_match
+        return prefix_to_class[prefix_match]
+      else
+        fail 'Unknown child prefix ' + rn_str + ' in container class ' +
+          parent_mo.class.to_s
+      end
+    end
+  end
 end

data/lib/{query.rb → acirb/query.rb}

@@ -1,4 +1,4 @@
-require 'restclient'
+require 'acirb/restclient'
 
 # rubocop:disable ClassLength
 # rubocop:disable FormatString

data/lib/{restclient.rb → acirb/restclient.rb}

@@ -104,6 +104,16 @@ module ACIrb
       @refresh_time = doc.at_css('aaaLogin')['refreshTimeoutSeconds']
     end
 
+    # Internal: Escape URI before using with APIC REST interface
+    # 
+    # uri - URI to escape
+    #
+    # Returns escaped URI as string
+
+    def escape(uri)
+      return URI.encode(uri, /[^\-_.!~*'()a-zA-Z\d;\/?:@&=+$,]/)
+    end
+
     # Internal: Posts data to the APIC REST interface
     #
     # options - Hash options for defining post parameters (default: {})
@@ -113,7 +123,7 @@ module ACIrb
     # Returns results of parse_response, which will be the parsed results of
     # the XML or JSON payload represented as ACIrb::MO objects
     def post(options)
-      post_url = URI.encode(@baseurl.to_s + options[:url].to_s)
+      post_url = self.escape(@baseurl.to_s + options[:url].to_s)
 
       data = options[:data]
       if @format == 'xml'
@@ -138,7 +148,7 @@ module ACIrb
     # Returns results of parse_response, which will be the parsed results of
     # the XML or JSON payload represented as ACIrb::MO objects
     def get(options)
-      get_url = URI.encode(@baseurl.to_s + options[:url].to_s)
+      get_url = self.escape(@baseurl.to_s + options[:url].to_s)
 
       puts 'GET REQUEST', get_url if @debug
       response = @client.get(get_url)
@@ -238,7 +248,7 @@ module ACIrb
       query_obj.subscribe = 'yes'
       query_uri = query_obj.uri(@format)
 
-      get_url = URI.encode(@baseurl.to_s + query_uri.to_s)
+      get_url = self.escape(@baseurl.to_s + query_uri.to_s)
 
       puts 'GET REQUEST', get_url if @debug
       response = @client.get(get_url)