spectools 1.0.0 → 1.0.1

data/CHANGELOG.txt

@@ -1 +1,3 @@
 1.0.0 - Initial release.
+1.0.1 - Bugfix release.
+Fixed some of the command handling to use proper quoting, as well as handling for escaping.

data/Manifest.txt

@@ -1,5 +1,5 @@
-TODO
 CHANGELOG.txt
+TODO
 Manifest.txt
 README.txt
 README.vnmsh.txt

data/README.txt

@@ -1,33 +1,378 @@
-SpecTools is a toolset designed to make working with CA's SPECTRUM product (now Network Fault Manager) much easier. The base library represents the SPECTRUM data model: Models, Events, Alarms, Model Types, etc. All extra functionality is provided by extensions.
+= spectools
 
-Using the base SpecTools classes is very simple. Just require it!
+*  http://rubyforge.org/projects/spectools/
 
-	require 'rubygems'
-	require 'spcetools'
+== DESCRIPTION:
 
-	model = SpecTools::Model.new
-	model.handle = 'test handle'
+SpecTools is a library for accessing the data model for
+CA SPECTRUM's data model.
 
-All of the classes have good RDoc, so reference it to see what the structure looks like.
 
-Using Extensions.
+== FEATURES/PROBLEMS:
 
-SpecTools has a very easy way of adding extra functionality to the library, called extensions.
+* Supplies basic data model classes.
+* The VNMSH extension allows for data access via the CLI interface.
 
-Using extensions.
+== SYNOPSIS:
 
-Using an extension is usually just a matter of requiring the object. For example, to use
-the CLI extenson, VNMSH, you would just:
+        require 'rubygems'
+        require 'spcetools'
 
-	require 'rubygems'
-	require 'spectools'
-	require 'vnmsh'
+        model = SpecTools::Model.new
+        model.handle = 'test handle'
 
-Extensions extend the SpecTools by adding methods to the SpecTools classes. The methods all share
-a common prefix, which identifies the extension.`SpecTools has a config option,
-SpecTools::Config.default_access_method , that allows a user to determine what extension methods
-to use by default. For example, if SpecTools::Config.default_access_method = :cli , any method with
-a cli_ prefix will be available without needing to use the prefix. To continue the example, calling
-Model.find will automatically call Model.cli_find for you.
+see README.spectools.txt for more details.
+== REQUIREMENTS:
+
+* Just rubygems!
+
+== INSTALL:
+
+* gem install spectools
+
+== LICENSE:
+
+	    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software
+    interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Program does not specify a
+version number of this License, you may choose any version ever
+published by the Free Software Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
 
-Currently, the only available extension is VNMSH. You can read more about it in README.vnmsh. 

data/lib/spectools.rb

@@ -283,8 +283,10 @@ module SpecTools
 		attr_accessor :attrs
 		#The type of inheritance
 		attr_accessor :inheritance
+		#The landscape on which the MType exists.
+		attr_accessor :landscape
 		
-		def initialize(handle = nil, name = nil, attrs=Hash.new, visible = false, instantiable = false, derivable = false, destroyable = true, unique = false, required = false,inheritance = nil)
+		def initialize(handle = nil, name = nil, attrs=Hash.new, visible = false, instantiable = false, derivable = false, destroyable = true, unique = false, required = false,inheritance = nil, landscape = Landscape.new)
 			if  handle.nil? || handle.hex?
 				@handle = handle
 			else
@@ -299,6 +301,7 @@ module SpecTools
 			@required = required
 			@inheritance = inheritance
 			@attrs = populate(attrs)
+			@landscape = landscape
 		end
 
 		#define a custom setter for attrs that will automatically convert
@@ -344,8 +347,10 @@ module SpecTools
 		attr_accessor :type
 		#A hash of Attr objects for the model
 		attr_accessor :attrs
+		#The landscape on which the Model exists.
+		attr_accessor :landscape
 	
-		def initialize(handle = nil, name = nil, type = MType.new, *attrs)
+		def initialize(handle = nil, name = nil, type = MType.new, landscape = Landscape.new,*attrs)
 			if handle.nil? || handle.hex?
 				@handle = handle
 			else
@@ -354,6 +359,7 @@ module SpecTools
 			@name = name
 			@type = type
 			@attrs = Hash.new
+			@landscape = landscape
 			attrs.each do |specattr|
 				if specattr.nil? || specattr.instance_of?(Attr)
 					@attrs[specattr.id] = specattr
@@ -377,10 +383,13 @@ module SpecTools
 		attr_accessor :name
 		#This relation's type
 		attr_accessor :type
+		#The landscape on which the Relation exists.
+		attr_accessor :landscape
 		
-		def initialize(name = nil, type = nil)
+		def initialize(name = nil, type = nil, landscape = Landscape.new)
 			@name = name
 			@type = type
+			@landscape = landscape
 		end
 
 	end
@@ -439,8 +448,14 @@ module SpecTools
 		attr_accessor :url
 		#The ticket number associated with this alarm
 		attr_accessor :ticket
-
-		def initialize(id = nil, time = nil, causeid = nil, model = Model.new, severity = nil, ack = false, stale = false, assignment = nil, status = nil, message = nil, url = nil, ticket = nil)
+		#The landscape on which the alarm was thrown
+		attr_accessor :landscape
+		#Set to true if the alarm is clearable by a user.
+		attr_accessor :clearable
+		#The state of the alarm
+		attr_accessor :state
+
+		def initialize(id = nil, time = nil, causeid = nil, model = Model.new, severity = nil, ack = false, stale = false, assignment = nil, status = nil, message = nil, url = nil, ticket = nil, clearable = nil, state = nil, landscape = Landscape.new)
 			@id = id
 			@time = time
 			if causeid.nil? || causeid.hex?
@@ -461,6 +476,9 @@ module SpecTools
 			@message = message
 			@url = url
 			@ticket = ticket
+			@landscape = landscape
+			@clearable = clearable
+			@state = state
 		end
 
 		#Returns true if the alarm has been acknowledged
@@ -494,7 +512,7 @@ module SpecTools
 		#The landscape's handle
 		attr_accessor :handle
 
-		def initialize(handle = nil, ssname = nil, precedence = nil, port = nil, service = nil )
+		def initialize(handle = nil, ssname = nil, precedence = nil, port = nil, service = nil)
 			@ss = ssname
 			@precedence = precedence
 			@port = port
@@ -522,9 +540,11 @@ module SpecTools
 		#The Model the event was asserted against
 		attr_accessor :model
 		#The event message
-		attr_accessor :message
+		attr_accessor :message 
+		#The landscape on which the Event exists.
+		attr_accessor :landscape
 		
-		def initialize(time = nil, type = nil, model = Model.new, message = '')
+		def initialize(time = nil, type = nil, model = Model.new, message = '',landscape = Landscape.new)
 			@time = time
 			if type.nil? || type.hex?
 				@type = type
@@ -533,6 +553,7 @@ module SpecTools
 			end
 			@model = model
 			@message = message
+			@landscape = landscape
 		end
 
 	end
@@ -548,10 +569,13 @@ module SpecTools
 		attr_accessor :left_mtype
 		#The MType on the right hand side of the rule
 		attr_accessor :right_mtype
+		#The landscape on which the Rule exists.
+		attr_accessor :landscape
 		
-		def initialize(left_mtype = MType.new, right_mtype = MType.new)
+		def initialize(left_mtype = MType.new, right_mtype = MType.new, landscape = Landscape.new)
 			@left_mtype = left_mtype
 			@right_mtype = right_mtype
+			@landscape = landscape
 		end
 		
 	end

data/lib/spectools/version.rb

@@ -2,7 +2,7 @@ module Spectools #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/vnmsh.rb

@@ -176,7 +176,17 @@ if defined?(SpecTools::MType)
 			end
 			mtype_output = session.show_types(filter)
 			mtype_output.each do |line|
-				mtypes.push(MType.parse(line))
+				mtype = MType.parse(line)
+				if filter && filter[:landscape]
+					if filter[:landscape].kind_of?(Landscape)
+						mtype.landscape = filter[:landscape]
+					else
+						mtype.landscape = Landscape.new(filter[:landscape])
+					end
+				else
+					mtype.landscape = session.current_landscape
+				end
+				mtypes.push(mtype)
 			end
 			return mtypes
 		end	
@@ -302,7 +312,17 @@ if defined?(SpecTools::Model)
 				model_output = session.show_models(filter)
 			end
 			model_output.each do |line|
-				models.push(Model.parse(line))
+				model = Model.parse(line)
+				if filter && filter[:landscape]
+					if filter[:landscape].kind_of?(Landscape)
+						model.landscape = filter[:landscape]
+					else
+						model.landscape = Landscape.new(filter[:landscape])
+					end
+				else
+					model.landscape = session.current_landscape
+				end
+				models.push(model)
 			end
 			return models
 		end
@@ -521,7 +541,18 @@ if defined?(SpecTools::Relation)
 			session = VNMSH.get_session(session)
 			rel_output = session.show_relations(landscape)
 			rel_output.each do |line|
-				relations.push(Relation.parse(line))
+				relation = Relation.parse(line)
+				if landscape
+					if landscape.kind_of?(Landscape)
+						relation.landscape = landscape
+					else
+						relation.landscape = Landscape.new(landscape)
+					end
+				else
+					relation.landscape = session.current_landscape
+				end
+				relations.push(relation)
+
 			end
 			return relations
 		end
@@ -535,7 +566,17 @@ if defined?(SpecTools::Relation)
 			rules = Array.new
 			rule_output = session.show_rules(self)
 			rule_output.each do |line|
-				rules.push(Rule.parse(line))
+				rule = Rule.parse(line)
+				if landscape
+					if landscape.kind_of?(Landscape)
+						rule.landscape = landscape
+					else
+						rule.landscape = Landscape.new(landscape)
+					end
+				else
+					rule.landscape = session.current_landscape
+				end
+				rules.push(rule)
 			end
 			return rules
 		end
@@ -668,7 +709,17 @@ if defined?(SpecTools::Alarm)
 			causes = Hash.new
 			alarm_output.each do |line|
 				if line =~ /\d+\s+\d\d\/\d\d\/\d\d\d\d/ 
-					alarms.push(Alarm.parse(line))
+					alarm = Alarm.parse(line)
+					if type == :landscape
+						if mh_or_lh.kind_of?(Landscape)
+							alarm.landscape = mh_or_lh
+						else
+							alarm.landscape = Landscape.new(mh_or_lh)
+						end
+					else
+						alarm.landscape = session.current_landscape
+					end
+					alarms.push(alarm)
 				elsif line =~ /^(0x[a-fA-F0-9]+)\s/
 					causeid = $1
 					causes[causeid] = line.sub(/^(0x[a-fA-F0-9]+)\s/,"")
@@ -742,7 +793,17 @@ if defined?(SpecTools::Event)
 			event_output = session.show_events(type,mh_or_lh,limit,evformat)
 			event_output.each do |line|
 				if line =~ /^\d\d\/\d\d\/\d\d\d\d/
-					events.push(Event.parse(line))
+					event = Event.parse(line)
+					if type == :landscape
+						if mh_or_lh.kind_of?(Landscape)
+							event.landscape = mh_or_lh
+						else
+							event.landscape = Landscape.new(mh_or_lh)
+						end
+					else
+						event.landscape = session.current_landscape
+					end
+					events.push(event)
 				else
 					events.last.message = events.last.message + line
 				end
@@ -896,6 +957,7 @@ class VNMSH
 		disconnectcmd = @specroot + '/vnmsh/disconnect 2>&1'
 		output = StringIO.new(`#{disconnectcmd}`)
 		@connected = false
+		@current_landscape = nil
 		result = output.readline
 		if result =~ /^disconnect: successful/
 			return true
@@ -1042,11 +1104,11 @@ class VNMSH
 				when :type
 					showcmd += ' mth=' + get_handle(filter[option],MType)	
 				when :name
-					showcmd += ' mname=' + filter[option]
+					showcmd += ' mname="' + filter[option] + '"'
 				when :landscape
 					showcmd += ' lh=' + get_handle(filter[option],Landscape)
 				else
-					raise ArgumentError, 'Valid filter options are :range, :name, :flag, or :landscape'
+					raise ArgumentError, 'Valid filter options are :range, :name, :type, or :landscape'
 				end
 			end
 		end
@@ -1148,7 +1210,7 @@ class VNMSH
 						get_handle(filter[option][1],MType) if filter[option].kind_of?(Array)
 					
 				when :name
-					showcmd += ' mtname=' + filter[option]
+					showcmd += ' mtname="' + filter[option] + '"'
 				when :flag
 					showcmd += ' flags=' + filter[option]
 				when :landscape
@@ -1594,7 +1656,7 @@ class VNMSH
 		createcmd += get_handle(mtype,MType)
 		createcmd += expand_attrs(attrs) if attrs
 		createcmd += ' lh=' + get_handle(landscape,Landscape) if landscape
-		output = exec_cmd(createcmd)
+		output = exec_cmd(expand_backslashes(createcmd))
 		result = output.readlines.last
 		if result =~ /created model handle\s+=\s+(0x[0-f]+)/
 			model = Model.new
@@ -1621,7 +1683,7 @@ class VNMSH
 		updatecmd = 'update mh='
 		updatecmd += get_handle(model,Model)
 		updatecmd += expand_attrs(attrs)
-		output = exec_cmd(updatecmd)
+		output = exec_cmd(expand_backslashes(updatecmd))
 		result = output.readlines.first
 		if result =~ /^Id/
 			return true
@@ -1670,7 +1732,7 @@ class VNMSH
 				updatecmd += process_alarm_action(key,action[key])
 			end
 		end
-		result = exec_cmd(updatecmd)
+		result = exec_cmd(expand_backslashes(updatecmd))
 		if $?.exitstatus == 0
 			return true
 		else
@@ -1730,11 +1792,11 @@ class VNMSH
 		createcmd = 'create alarm '
 		createcmd += '-nr ' if replace
 		if severity =~ /CRITICAL/i ||
-					/MAJOR/i ||
-					/MINOR/i ||
-					/SUPPRESSED/i ||
-					/MAINTENANCE/i ||
-					/INITIAL/i
+		   severity =~ /MAJOR/i ||
+		   severity =~ /MINOR/i ||
+		   severity =~ /SUPPRESSED/i ||
+		   severity =~ /MAINTENANCE/i ||
+		   severity =~ /INITIAL/i
 			createcmd += "sev=#{severity} "
 		else
 			raise ArgumentError, 'Severity must be CRITICAL, MAJOR, MINOR, SUPPRESSED, MAINTENANCE, or INITIAL'
@@ -1776,7 +1838,7 @@ class VNMSH
 			raise ArgumentError, 'You must pass a valid Event Code'
 		end
 		createcmd += ' mh=' + get_handle(model,Model)
-		output = exec_cmd(createcmd)
+		output = exec_cmd(expand_backslashes(createcmd))
 		if $?.exitstatus > 0
 			raise CommandError, output.readlines.first
 		else
@@ -1794,6 +1856,10 @@ class VNMSH
 
 	private
 
+	def expand_backslashes(cmd)
+		return cmd.gsub(/\\/,'\\\\\\\\')
+	end
+
 	def valid_alarm_action?(action)
 		validactions = [ :ticket,
 				 :assign,

data/test/test_spectools.rb

@@ -49,6 +49,8 @@ class TestSpectool < Test::Unit::TestCase
 	@alarmcause = "Test Cause"
 	@alarmurl = "http://www.test.com"
 	@alarmticket = "ticket12345"
+	@alarmclearable = true
+	@alarmstate = 'NEW'
 	@ssname = "test.ss.com"
 	@lscapeprecedence = 10
 	@lscapeport = "0xbeef"
@@ -187,13 +189,14 @@ class TestSpectool < Test::Unit::TestCase
 	assert_equal false, mtype.required
 	assert_nil mtype.inheritance
 	assert_instance_of Hash, mtype.attrs
-	
+	assert_instance_of Landscape, mtype.landscape
   end
 
   def test_init_mtype_args
 	attr1 = SpecTools::Attr.new('0x01','test')
 	attr2 = SpecTools::Attr.new(@attrid,@attrname)
-	mtype = SpecTools::MType.new(@mthandle,@mtname,[attr1,attr2],@mtvisible,@mtinstantiable,@mtderivable,@mtdestroy,@mtunique,@mtrequired,@mtinheritance)
+	testlscape = SpecTools::Landscape.new('0x400000')
+	mtype = SpecTools::MType.new(@mthandle,@mtname,[attr1,attr2],@mtvisible,@mtinstantiable,@mtderivable,@mtdestroy,@mtunique,@mtrequired,@mtinheritance,testlscape)
 	assert_equal @mthandle, mtype.handle
 	assert_equal @mtname, mtype.name
 	assert_equal @mtvisible, mtype.visible
@@ -211,6 +214,7 @@ class TestSpectool < Test::Unit::TestCase
 	assert_raise ArgumentError do
 		SpecTools::MType.new(nil,nil,["notanattr"])
 	end
+	assert_same testlscape, mtype.landscape
   end
 
   def test_set_mtype_attrs
@@ -234,29 +238,35 @@ class TestSpectool < Test::Unit::TestCase
 	assert_nil smodel.handle
 	assert_instance_of SpecTools::MType, smodel.type
 	assert_equal Hash.new, smodel.attrs
+	assert_instance_of Landscape, smodel.landscape
   end
 
   def test_init_model_args
 	attr1 = SpecTools::Attr.new
 	attr2 = SpecTools::Attr.new(@attrid,@attrname)
 	mtype = SpecTools::MType.new(@mthandle,@mtname)
-	smodel = SpecTools::Model.new(@modelhandle, @modelname, mtype, attr1, attr2)
+	testlscape = SpecTools::Landscape.new('0x400000')
+	smodel = SpecTools::Model.new(@modelhandle, @modelname, mtype, testlscape,attr1, attr2)
 	assert_equal @modelhandle, smodel.handle
 	assert_same mtype, smodel.type
 	assert_same attr1, smodel.attrs[attr1.id]
 	assert_same attr2, smodel.attrs[attr2.id]
+	assert_same testlscape, smodel.landscape
   end
 
   def test_init_relation
 	relation = SpecTools::Relation.new
 	assert_nil relation.name
 	assert_nil relation.type
+	assert_instance_of Landscape, relation.landscape
   end
 
   def test_init_relation_args
-	relation = SpecTools::Relation.new(@relname,@reltype)
+	testlscape = SpecTools::Landscape.new('0x400000')
+	relation = SpecTools::Relation.new(@relname,@reltype,testlscape)
 	assert_equal @relname, relation.name
 	assert_equal @reltype, relation.type
+	assert_same testlscape, relation.landscape
   end
 
   def test_init_association
@@ -290,11 +300,15 @@ class TestSpectool < Test::Unit::TestCase
 	assert_nil alarm.message
 	assert_nil alarm.url
 	assert_nil alarm.ticket
+	assert_nil alarm.clearable
+	assert_nil alarm.state
+	assert_instance_of SpecTools::Landscape, alarm.landscape
   end
 
   def test_init_alarm_args
 	testmodel = SpecTools::Model.new(@modelhandle, @modelname, SpecTools::MType.new(nil,@mtname))
-        alarm = SpecTools::Alarm.new(@alarmid, @alarmtime, @alarmcauseid, testmodel, @alarmseverity, @alarmack, @alarmstale, @alarmassign, @alarmstatus,@alarmcause,@alarmurl,@alarmticket)
+	testlscape = SpecTools::Landscape.new('0x400000')
+        alarm = SpecTools::Alarm.new(@alarmid, @alarmtime, @alarmcauseid, testmodel, @alarmseverity, @alarmack, @alarmstale, @alarmassign, @alarmstatus,@alarmcause,@alarmurl,@alarmticket,@alarmclearable,@alarmstate,testlscape)
         assert_equal @alarmid, alarm.id
         assert_equal @alarmtime, alarm.time
         assert_equal @alarmcauseid, alarm.causeid
@@ -307,12 +321,16 @@ class TestSpectool < Test::Unit::TestCase
 	assert_equal @alarmcause, alarm.message
 	assert_equal @alarmurl, alarm.url
 	assert_equal @alarmticket, alarm.ticket
+	assert_equal @alarmclearable, alarm.clearable
+	assert_equal @alarmstate, alarm.state
+	
 	assert_raise ArgumentError do
 		SpecTools::Alarm.new(nil,nil,"bogus")
 	end
 	assert_raise ArgumentError do
 		SpecTools::Alarm.new(nil,nil,nil,"bogus")
 	end
+	assert_same testlscape,alarm.landscape
   end
 
   def test_init_landscape
@@ -342,11 +360,13 @@ class TestSpectool < Test::Unit::TestCase
 	assert_nil event.type
 	assert_equal '', event.message
 	assert_instance_of SpecTools::Model, event.model
+	assert_instance_of SpecTools::Landscape, event.landscape
   end
 
   def test_init_event_args
 	model = SpecTools::Model.new(@modelhandle,@modelname)
-	event = SpecTools::Event.new(@eventtime,@eventtype,model,@eventmessage)
+	testlscape = SpecTools::Landscape.new('0x400000')
+	event = SpecTools::Event.new(@eventtime,@eventtype,model,@eventmessage,testlscape)
 	assert_equal @eventtime, event.time
 	assert_equal @eventtype, event.type
 	assert_equal @eventmessage, event.message
@@ -354,20 +374,25 @@ class TestSpectool < Test::Unit::TestCase
 	assert_raise ArgumentError do
 		SpecTools::Event.new(nil,"bogus")
 	end
+	assert_same testlscape, event.landscape
+	
   end
 
   def test_init_rule
 	rule = SpecTools::Rule.new
 	assert_instance_of SpecTools::MType, rule.left_mtype 
 	assert_instance_of SpecTools::MType, rule.right_mtype
+	assert_instance_of Landscape, rule.landscape
   end
 
   def test_init_rule_args
 	mtype1 = SpecTools::MType.new
 	mtype2 = SpecTools::MType.new
-	rule = SpecTools::Rule.new(mtype1,mtype2)
+	testlscape = SpecTools::Landscape.new('0x400000')
+	rule = SpecTools::Rule.new(mtype1,mtype2,testlscape)
 	assert_same mtype1, rule.left_mtype
 	assert_same mtype2, rule.right_mtype
+	assert_same testlscape, rule.landscape
   end
 
   def test_watch_init

data/test/test_vnmsh.rb

@@ -114,6 +114,7 @@ class VNMSHConnectionTests < Test::Unit::TestCase
   def test_vnmsh_connect
 	landscape = @session.connect
 	assert_instance_of SpecTools::Landscape, landscape
+	assert_same landscape, @session.current_landscape
   end
 
   def test_vnmsh_connect_args
@@ -126,6 +127,7 @@ class VNMSHConnectionTests < Test::Unit::TestCase
   	assert_instance_of SpecTools::Landscape, landscape
 	assert_equal 'testhost', landscape.ss
 	assert_equal '0x400000', landscape.handle
+	assert_same landscape, @session.current_landscape
 	
 	(0..7).each do |i|
 		assert_raise VNMSH::ConnectError do
@@ -142,6 +144,7 @@ class VNMSHConnectionTests < Test::Unit::TestCase
 		@session.disconnect
 	end
 	assert_equal false, @session.connected?
+	assert_nil @session.current_landscape
   end
 
   def test_vnmsh_exec_cmd
@@ -1133,6 +1136,7 @@ class VNMSHCommandTests < Test::Unit::TestCase
 	end
 	models = SpecTools::Model.cli_find(nil,nil,@session)
 	assert_equal 2251, models.size
+	assert_same @session.current_landscape, models.first.landscape
 
 
   end
@@ -1159,6 +1163,7 @@ class VNMSHCommandTests < Test::Unit::TestCase
 	end
 	mtypes = SpecTools::MType.cli_find(nil,@session)
 	assert_equal 4209, mtypes.size
+	assert_same @session.current_landscape, mtypes.first.landscape
 
   end
 
@@ -1188,7 +1193,9 @@ class VNMSHCommandTests < Test::Unit::TestCase
 	assert_raise ArgumentError do
 		SpecTools::Alarm.cli_find(:all)
 	end
-	assert_equal 10, SpecTools::Alarm.cli_find(:all,nil,nil,@session).size
+	alarms = SpecTools::Alarm.cli_find(:all,nil,nil,@session)
+	assert_equal 10, alarms.size
+	assert_same @session.current_landscape, alarms.first.landscape
   end
 
   def test_event_cli_find_all
@@ -1211,6 +1218,7 @@ class VNMSHCommandTests < Test::Unit::TestCase
 	end
 	events = SpecTools::Event.cli_find(:all,nil,nil,nil,@session)
 	assert_equal 2000,events.size
+	assert_same @session.current_landscape, events.first.landscape
 
   end
 
@@ -1255,6 +1263,7 @@ class VNMSHCommandTests < Test::Unit::TestCase
 	  relations = nil
 	  relations = SpecTools::Relation.cli_find(nil,@session)	
 	  assert_equal 150, relations.size
+	  assert_same @session.current_landscape, relations.first.landscape
 
   end
 
@@ -1328,7 +1337,9 @@ class VNMSHCommandTests < Test::Unit::TestCase
   end
 
   def test_relation_find_all
-	  assert_equal 150, SpecTools::Relation.find(nil,@session).size
+	  relations = SpecTools::Relation.find(nil,@session)
+	  assert_equal 150, relations.size
+	  assert_same @session.current_landscape, relations.first.landscape
   end
 
   def test_cli_attr_get
@@ -1430,9 +1441,7 @@ class VNMSHCommandTests < Test::Unit::TestCase
 	  model = SpecTools::Model.new('0x400005cb')
 
 	  assert_equal 46, model.cli_get_children.size
-
 	  assert_equal 46, model.get_children.size
-
 	  assert_equal 13, model.get_children('PossPrimApp').size
 
 	  rel = SpecTools::Relation.new('PossPrimApp')
@@ -1484,7 +1493,9 @@ class VNMSHCommandTests < Test::Unit::TestCase
   def test_cli_rules_find
 	  relation = SpecTools::Relation.new('Collects')
 	  assert_equal 5837, relation.cli_get_rules.size
-	  assert_equal 5837, relation.get_rules.size
+	  rules = relation.get_rules(nil,@session)
+	  assert_equal 5837, rules.size
+	  assert_same @session.current_landscape, rules.first.landscape
   end
 
   def test_cli_watch_find

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spectools
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Donavan Pantke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-27 00:00:00 -04:00
+date: 2008-04-24 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -19,11 +19,14 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- CHANGELOG.txt
+- Manifest.txt
+- README.txt
+- README.vnmsh.txt
 files: 
-- TODO
 - CHANGELOG.txt
+- TODO
 - Manifest.txt
 - README.txt
 - README.vnmsh.txt
@@ -105,8 +108,9 @@ files:
 has_rdoc: true
 homepage: http://spectools.rubyforge.org
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -124,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: spectools
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: A utility suite for CA's SPECTRUM Network Fault Manager