Repository: qpid-dispatch Updated Branches: refs/heads/crolke-DISPATCH-188-1 5a9a4a8dc -> 4ca28e396
Get rid of class variables. Empty default folder allows creating empty Policy for testing. Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/4ca28e39 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/4ca28e39 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/4ca28e39 Branch: refs/heads/crolke-DISPATCH-188-1 Commit: 4ca28e396a057999b74e48970665ac5f694dce88 Parents: 5a9a4a8 Author: Chuck Rolke <[email protected]> Authored: Fri Dec 11 09:58:10 2015 -0500 Committer: Chuck Rolke <[email protected]> Committed: Fri Dec 11 09:58:10 2015 -0500 ---------------------------------------------------------------------- .../qpid_dispatch_internal/management/policy.py | 34 ++++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/4ca28e39/python/qpid_dispatch_internal/management/policy.py ---------------------------------------------------------------------- diff --git a/python/qpid_dispatch_internal/management/policy.py b/python/qpid_dispatch_internal/management/policy.py index 6cadb1d..35baa8d 100644 --- a/python/qpid_dispatch_internal/management/policy.py +++ b/python/qpid_dispatch_internal/management/policy.py @@ -523,21 +523,17 @@ class Policy(): """ The policy database. """ - - data = {} - folder = "." - schema_version = 1 - policy_compiler = None - - def __init__(self, folder=".", schema_version=1): + def __init__(self, folder="", schema_version=1): """ Create instance @params folder: relative path from __file__ to conf file folder """ + self.data = {} self.folder = folder self.schema_version = schema_version self.policy_compiler = PolicyCompiler(schema_version) - self.policy_io_read_files() + if not folder == "": + self.policy_io_read_files() # # Policy file I/O @@ -833,12 +829,18 @@ def main_except(argv): print("policy names: %s" % policy.policy_db_get_names()) - if options.dump: - print("Policy details:") - for pname in policy.policy_db_get_names(): - print("policy : %s" % pname) - p = ("%s" % policy.policy_read(pname)) - print(p.replace('\\n', '\n')) + if not options.dump: + return + + # Exercise a few functions + # Empty policy + policy2 = Policy() + + print("Policy details:") + for pname in policy.policy_db_get_names(): + print("policy : %s" % pname) + p = ("%s" % policy.policy_read(pname)) + print(p.replace('\\n', '\n')) # Lookups upolicy = {} @@ -851,6 +853,10 @@ def main_except(argv): print "Lookup ellen from 72.135.2.9. Expect true and max_frame_size 666666. Result is %s" % res print "Resulting policy is: %s" % upolicy + upolicy = {} + res = policy2.policy_lookup('ellen', '72.135.2.9', 'photoserver', upolicy) + print "Lookup policy2 ellen from 72.135.2.9. Expect false. Result is %s" % res + def main(argv): try: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
