[capirca] r245 committed - Add argument for Silverpeak fixed content file, and fix incorrect orde...

[cap...@googlecode.com]

Revision: 245
Author: wat...@google.com
Date: Wed Sep 11 16:09:55 2013 UTC
Log: Add argument for Silverpeak fixed content file, and fix incorrect
ordering of
arguments to the SilverPeak Generator that was causing an error.
--
Paul (Tony) Watson


http://code.google.com/p/capirca/source/detail?r=245

Modified:
/trunk/aclgen.py

=======================================
--- /trunk/aclgen.py Tue Sep 10 22:36:59 2013 UTC
+++ /trunk/aclgen.py Wed Sep 11 16:09:55 2013 UTC
@@ -61,6 +61,10 @@
_parser.add_option('-e', '--exp_info', type='int', action='store',
dest='exp_info', default=2,
help='Weeks in advance to notify that a term will
expire')
+_parser.add_option('-c', '--silverpeak_configlet_file',
+ dest='fixed_content_file',
+ help='Silverpeak fixed content file',
+ default=None)

(FLAGS, args) = _parser.parse_args()

@@ -169,7 +173,7 @@
do_output_filter(str(fw), filter_name(source_file, fw._SUFFIX))
count += 1
if spk:
- spk_obj = silverpeak.Silverpeak(spk, exp_info, '')
+ spk_obj = silverpeak.Silverpeak(spk, exp_info, fixed_content_file)
do_output_filter(spk_obj.GenerateACLString(),
filter_name(source_file, spk_obj._SUFFIX))
do_output_filter(spk_obj.GenerateConfString(),