Fixed raising KeyError on optional values
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4139b16b Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4139b16b Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4139b16b Branch: refs/heads/master Commit: 4139b16bbf4075dd4d1ebdeb6eb43d1a89857179 Parents: d23da98 Author: Chamila de Alwis <[email protected]> Authored: Sat Oct 11 19:16:11 2014 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Sat Oct 11 19:16:11 2014 +0530 ---------------------------------------------------------------------- .../cartridge-agent/modules/event/topology/events.py | 5 +++-- .../cartridge-agent/modules/topology/topologycontext.py | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/4139b16b/tools/python-cartridge-agent/cartridge-agent/modules/event/topology/events.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/event/topology/events.py b/tools/python-cartridge-agent/cartridge-agent/modules/event/topology/events.py index 3b0a97c..18580c2 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/event/topology/events.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/event/topology/events.py @@ -162,8 +162,9 @@ class CompleteTopologyEvent: cluster_obj.hostnames = cluster_str["hostNames"] cluster_obj.tenant_range = cluster_str["tenantRange"] if "tenantRange" in cluster_str else None cluster_obj.is_lb_cluster = cluster_str["isLbCluster"] + cluster_obj.is_kubernetes_cluster = cluster_str["isKubernetesCluster"] cluster_obj.status = cluster_str["status"] - cluster_obj.load_balancer_algorithm_name = cluster_str["loadBalanceAlgorithmName"] + cluster_obj.load_balancer_algorithm_name = cluster_str["loadBalanceAlgorithmName"] if "loadBalanceAlgorithmName" in cluster_str else None cluster_obj.properties = cluster_str["properties"] cluster_obj.member_list_json = "[" @@ -180,7 +181,7 @@ class CompleteTopologyEvent: member_obj.status = member_str["status"] member_obj.member_ip = member_str["memberIp"] member_obj.properties = member_str["properties"] - member_obj.lb_cluster_id = member_str["lbClusterId"] + member_obj.lb_cluster_id = member_str["lbClusterId"] if "lbClusterId" in member_str else None member_obj.json_str = member_str cluster_obj.member_list_json += member_str + "," http://git-wip-us.apache.org/repos/asf/stratos/blob/4139b16b/tools/python-cartridge-agent/cartridge-agent/modules/topology/topologycontext.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/topology/topologycontext.py b/tools/python-cartridge-agent/cartridge-agent/modules/topology/topologycontext.py index 8f81802..5fe2ea4 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/topology/topologycontext.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/topology/topologycontext.py @@ -211,6 +211,8 @@ class Cluster: """ :type : str """ self.is_lb_cluster = False """ :type : bool """ + self.is_kubernetes_cluster = False + """ :type : bool """ self.status = None """ :type : str """ self.load_balancer_algorithm_name = None
