[ACM] Pass uuid to created policy

A UUID needs to be passed to the created policy.

Signed-off-by: stefan Berger <stefanb@us.ibm.com>

diff --git a/tools/python/xen/util/acmpolicy.py b/tools/python/xen/util/acmpolicy.py
index 5d4711c52ddbd5eda1fe74480dce0a538aea1555..64978a68dc802ded4d3b91495c39bf354eb7693d 100644 (file)
--- a/tools/python/xen/util/acmpolicy.py
+++ b/tools/python/xen/util/acmpolicy.py
@@ -507,7 +507,7 @@ class ACMPolicy(XSPolicy):
             rc = self.compile()
         return rc, errors
 
-    def force_default_policy(klass):
+    def force_default_policy(klass, policy_ref):
         """
            Force the installation of the DEFAULT policy if for
            example no XML of the current policy is available and
@@ -518,7 +518,7 @@ class ACMPolicy(XSPolicy):
         """
         errors = ""
 
-        acmpol_new = ACMPolicy(xml = get_DEFAULT_policy())
+        acmpol_new = ACMPolicy(xml = get_DEFAULT_policy(), ref=policy_ref)
 
         from xen.lowlevel import acm
         dom0_ssidref = acm.getssid(0)

diff --git a/tools/python/xen/xend/XendXSPolicyAdmin.py b/tools/python/xen/xend/XendXSPolicyAdmin.py
index 4075d5b125dd86d789f76b3364e6b0824154866e..e9e5efe77bff7476245ade878f5938566edddc5b 100644 (file)
--- a/tools/python/xen/xend/XendXSPolicyAdmin.py
+++ b/tools/python/xen/xend/XendXSPolicyAdmin.py
@@ -63,7 +63,7 @@ class XSPolicyAdmin:
         except Exception, e:
             log.error("Could not find XML representation of policy '%s': "
                       "%s" % (act_pol_name,e))
-            rc, errors, acmpol_def = ACMPolicy.force_default_policy()
+            rc, errors, acmpol_def = ACMPolicy.force_default_policy(ref)
             if rc == xsconstants.XSERR_SUCCESS:
                 self.xsobjs[ref] = acmpol_def
                 self.policies[ref] = (acmpol_def.get_name(),