More fixes for port locking.

The script 'common.py' reads the config from xenopsd's database
directly. The past few commits made sure the on-disk database
was up-to-date after API calls to mutate various fields. However,
there is also some further modification of some of the fields
done by the xc driver - for example, the 'extra_private_fields'
string -> string map is augmented with some extra kvs derived
from other fields. In particular, the ipv4_allowed and
ipv6_allowed keys are derived from the locking_mode parameter.
These keys ended up in xenstore but not in the on-disk
json representation of the VIF. The same happened for the
network-backend field - added by xenopsd to the same map, and
thus not in the on-disk json. This was fixed in a xen-api
commit by explicitly adding it in xapi, which was a bit of
a hack.

Signed-off-by: Jon Ludlam <[email protected]>

Author: Jon Ludlam

scripts/common.py

@@ -204,13 +204,13 @@ def get_words(value, separator):
         private = self.json["extra_private_keys"]
         if "locking_mode" in self.json:
             if type(self.json["locking_mode"]) is list:
+		# Must be type=locked here
                 results["locking_mode"] = self.json["locking_mode"][0].lower()
+		locked_params=self.json["locking_mode"][1]
+		results["ipv4_allowed"] = locked_params["ipv4"]
+		results["ipv6_allowed"] = locked_params["ipv6"]
             else:
                 results["locking_mode"] = self.json["locking_mode"].lower()
-        if "ipv4-allowed" in private:
-            results["ipv4_allowed"] = get_words(private["ipv4-allowed"].lower(), ",")
-        if "ipv6-allowed" in private:
-            results["ipv6_allowed"] = get_words(private["ipv6-allowed"].lower(), ",")
         send_to_syslog("Got locking config: %s" % (repr(results)))
         return results