Repository: stratos Updated Branches: refs/heads/master 91232ed92 -> 9a355d9a0
Multiple public private IPs for member - Cartridge Agent changes Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9a355d9a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9a355d9a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9a355d9a Branch: refs/heads/master Commit: 9a355d9a0061364c3689d479a072f72ddd4b0893 Parents: 91232ed Author: Chamila de Alwis <[email protected]> Authored: Sun Dec 21 19:14:36 2014 +0530 Committer: reka <[email protected]> Committed: Sun Dec 21 21:22:30 2014 +0530 ---------------------------------------------------------------------- .../modules/event/topology/events.py | 21 ++++++++----- .../extensions/defaultextensionhandler.py | 32 ++++++++++---------- .../modules/topology/topologycontext.py | 8 +++-- .../modules/util/extensionutils.py | 2 +- 4 files changed, 36 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/9a355d9a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/topology/events.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/topology/events.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/topology/events.py index cf275f4..8757a19 100644 --- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/topology/events.py +++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/topology/events.py @@ -39,7 +39,7 @@ class MemberActivatedEvent: """ :type : str """ self.port_map = {} """ :type : dict[str, Port] """ - self.member_ip = None + self.member_private_ips = None """ :type : str """ def get_port(self, proxy_port): @@ -67,7 +67,10 @@ class MemberActivatedEvent: instance.network_partition_id = json_obj["networkPartitionId"] if "networkPartitionId" in json_obj else None instance.partition_id = json_obj["partitionId"] if "partitionId" in json_obj else None #instance.port_map = json_obj["portMap"] if "portMap" in json_obj else {} - instance.member_ip = json_obj["memberIp"] if "memberIp" in json_obj else None + instance.member_private_ips = json_obj["memberPrivateIPs"] if "memberPrivateIPs" in json_obj else None + instance.member_public_ips = json_obj["memberPublicIPs"] if "memberPublicIPs" in json_obj else None + instance.member_default_public_ip = json_obj["defaultPublicIP"] if "defaultPublicIP" in json_obj else None + instance.member_default_private_ip = json_obj["defaultPrivateIP"] if "defaultPrivateIP" in json_obj else None for port_proxy in json_obj["portMap"]: port_str = json_obj["portMap"][port_proxy] @@ -203,9 +206,9 @@ class CompleteTopologyEvent: mm_partition_id = member_str["partitionId"] if "partitionId" in member_str else None member_obj = Member(mm_service_name, mm_cluster_id, mm_network_partition_id, mm_partition_id, member_id) - member_obj.member_public_ip = member_str["memberPublicIp"] if "memberPublicIp" in member_str else None + member_obj.member_public_ips = member_str["memberPublicIPs"] if "memberPublicIPs" in member_str else None member_obj.status = member_str["status"] if "status" in member_str else None - member_obj.member_ip = member_str["memberIp"] + member_obj.member_private_ips = member_str["memberPrivateIPs"] member_obj.properties = member_str["properties"] member_obj.lb_cluster_id = member_str["lbClusterId"] if "lbClusterId" in member_str else None member_obj.json_str = member_str @@ -284,9 +287,9 @@ class InstanceSpawnedEvent: """ :type : str """ self.lb_cluster_id = None """ :type : str """ - self.member_public_ip = None + self.member_public_ips = None """ :type : str """ - self.member_ip = None + self.member_private_ips = None """ :type : str """ self.properties = {} """ :type : dict[str, str] """ @@ -304,8 +307,10 @@ class InstanceSpawnedEvent: instance.network_partition_id = json_obj["networkPartitionId"] if "networkPartitionId" in json_obj else None instance.partition_id = json_obj["partitionId"] if "partitionId" in json_obj else None instance.lb_cluster_id = json_obj["lbClusterId"] if "lbClusterId" in json_obj else None - instance.member_public_ip = json_obj["memberPublicIp"] if "memberPublicIp" in json_obj else None - instance.member_ip = json_obj["memberIp"] if "memberIp" in json_obj else None + instance.member_private_ips = json_obj["memberPrivateIPs"] if "memberPrivateIPs" in json_obj else None + instance.member_public_ips = json_obj["memberPublicIPs"] if "memberPublicIPs" in json_obj else None + instance.member_default_public_ip = json_obj["defaultPublicIP"] if "defaultPublicIP" in json_obj else None + instance.member_default_private_ip = json_obj["defaultPrivateIP"] if "defaultPrivateIP" in json_obj else None instance.properties = json_obj["properties"] return instance \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/9a355d9a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/extensions/defaultextensionhandler.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/extensions/defaultextensionhandler.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/extensions/defaultextensionhandler.py index 10e783a..3670151 100644 --- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/extensions/defaultextensionhandler.py +++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/extensions/defaultextensionhandler.py @@ -153,7 +153,7 @@ class DefaultExtensionHandler(AbstractExtensionHandler): if extensionutils.is_relevant_member_event(member_activated_event.service_name, member_activated_event.cluster_id, lb_cluster_id): - env_params = {"STRATOS_MEMBER_ACTIVATED_MEMBER_IP": str(member_activated_event.member_ip), + env_params = {"STRATOS_MEMBER_ACTIVATED_MEMBER_IP": str(member_activated_event.member_default_private_ip), "STRATOS_MEMBER_ACTIVATED_MEMBER_ID": str(member_activated_event.member_id), "STRATOS_MEMBER_ACTIVATED_CLUSTER_ID": str(member_activated_event.cluster_id), "STRATOS_MEMBER_ACTIVATED_LB_CLUSTER_ID": str(lb_cluster_id), @@ -190,7 +190,7 @@ class DefaultExtensionHandler(AbstractExtensionHandler): has_wk_ip_changed = True for wk_member in self.wk_members: - if wk_member.member_ip == member_activated_event.member_ip: + if wk_member.member_default_private_ip == member_activated_event.member_default_private_ip: has_wk_ip_changed = False self.log.debug(" hasWKIpChanged %r" + has_wk_ip_changed) @@ -291,7 +291,7 @@ class DefaultExtensionHandler(AbstractExtensionHandler): member_terminated_event.cluster_id, lb_cluster_id): - env_params = {"STRATOS_MEMBER_TERMINATED_MEMBER_IP": terminated_member.member_ip, + env_params = {"STRATOS_MEMBER_TERMINATED_MEMBER_IP": terminated_member.member_default_private_ip, "STRATOS_MEMBER_TERMINATED_MEMBER_ID": member_terminated_event.member_id, "STRATOS_MEMBER_TERMINATED_CLUSTER_ID": member_terminated_event.cluster_id, "STRATOS_MEMBER_TERMINATED_LB_CLUSTER_ID": lb_cluster_id, @@ -340,7 +340,7 @@ class DefaultExtensionHandler(AbstractExtensionHandler): member_suspended_event.cluster_id, lb_cluster_id): - env_params = {"STRATOS_MEMBER_SUSPENDED_MEMBER_IP": member_suspended_event.member_ip, + env_params = {"STRATOS_MEMBER_SUSPENDED_MEMBER_IP": member_suspended_event.member_default_private_ip, "STRATOS_MEMBER_SUSPENDED_MEMBER_ID": member_suspended_event.member_id, "STRATOS_MEMBER_SUSPENDED_CLUSTER_ID": member_suspended_event.cluster_id, "STRATOS_MEMBER_SUSPENDED_LB_CLUSTER_ID": lb_cluster_id, @@ -389,7 +389,7 @@ class DefaultExtensionHandler(AbstractExtensionHandler): member_started_event.cluster_id, lb_cluster_id): - env_params = {"STRATOS_MEMBER_STARTED_MEMBER_IP": started_member.member_ip, + env_params = {"STRATOS_MEMBER_STARTED_MEMBER_IP": started_member.member_default_private_ip, "STRATOS_MEMBER_STARTED_MEMBER_ID": member_started_event.member_id, "STRATOS_MEMBER_STARTED_CLUSTER_ID": member_started_event.cluster_id, "STRATOS_MEMBER_STARTED_LB_CLUSTER_ID": lb_cluster_id, @@ -554,8 +554,8 @@ class DefaultExtensionHandler(AbstractExtensionHandler): return False apistore_member = apistore_member_list[0] - env_params["STRATOS_WK_APISTORE_MEMBER_IP"] = apistore_member.member_ip - self.log.debug("STRATOS_WK_APISTORE_MEMBER_IP: %r" % apistore_member.member_ip) + env_params["STRATOS_WK_APISTORE_MEMBER_IP"] = apistore_member.member_default_private_ip + self.log.debug("STRATOS_WK_APISTORE_MEMBER_IP: %r" % apistore_member.member_default_private_ip) publisher_member_list = [] for member in publisher_cluster_collection[0].get_members(): @@ -567,8 +567,8 @@ class DefaultExtensionHandler(AbstractExtensionHandler): self.log.debug("API Publisher members not yet created") publisher_member = publisher_member_list[0] - env_params["STRATOS_WK_PUBLISHER_MEMBER_IP"] = publisher_member.member_ip - self.log.debug("STRATOS_WK_PUBLISHER_MEMBER_IP: %r" % publisher_member.member_ip) + env_params["STRATOS_WK_PUBLISHER_MEMBER_IP"] = publisher_member.member_default_private_ip + self.log.debug("STRATOS_WK_PUBLISHER_MEMBER_IP: %r" % publisher_member.member_default_private_ip) return True @@ -613,13 +613,13 @@ class DefaultExtensionHandler(AbstractExtensionHandler): wk_members.append(member) self.wk_members.append(member) - self.log.debug("Found WKA: STRATOS_WK_MEMBER_IP: " + member.member_ip) + self.log.debug("Found WKA: STRATOS_WK_MEMBER_IP: " + member.member_default_private_ip) if len(wk_members) >= min_count: idx = 0 for member in wk_members: - env_params["STRATOS_WK_MEMBER_" + idx + "_IP"] = member.member_ip - self.log.debug("STRATOS_WK_MEMBER_" + idx + "_IP:" + member.member_ip) + env_params["STRATOS_WK_MEMBER_" + idx + "_IP"] = member.member_default_private_ip + self.log.debug("STRATOS_WK_MEMBER_" + idx + "_IP:" + member.member_default_private_ip) idx += 1 @@ -687,8 +687,8 @@ class DefaultExtensionHandler(AbstractExtensionHandler): min_manager_instances_available = True idx = 0 for member in manager_wka_members: - env_params["STRATOS_WK_MANAGER_MEMBER_" + idx + "_IP"] = member.member_ip - self.log.debug("STRATOS_WK_MANAGER_MEMBER_" + idx + "_IP: " + member.member_ip) + env_params["STRATOS_WK_MANAGER_MEMBER_" + idx + "_IP"] = member.member_default_private_ip + self.log.debug("STRATOS_WK_MANAGER_MEMBER_" + idx + "_IP: " + member.member_default_private_ip) idx += 1 env_params["STRATOS_WK_MANAGER_MEMBER_COUNT"] = int(manager_min_instance_count) @@ -748,8 +748,8 @@ class DefaultExtensionHandler(AbstractExtensionHandler): min_worker_instances_available = True idx = 0 for member in worker_wka_members: - env_params["STRATOS_WK_WORKER_MEMBER_" + idx + "_IP"] = member.member_ip - self.log.debug("STRATOS_WK_WORKER_MEMBER_" + idx + "_IP: " + member.member_ip) + env_params["STRATOS_WK_WORKER_MEMBER_" + idx + "_IP"] = member.member_default_private_ip + self.log.debug("STRATOS_WK_WORKER_MEMBER_" + idx + "_IP: " + member.member_default_private_ip) idx += 1 env_params["STRATOS_WK_WORKER_MEMBER_COUNT"] = int(worker_min_instance_count) http://git-wip-us.apache.org/repos/asf/stratos/blob/9a355d9a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/topology/topologycontext.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/topology/topologycontext.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/topology/topologycontext.py index 5fe2ea4..ba6daf4 100644 --- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/topology/topologycontext.py +++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/topology/topologycontext.py @@ -337,12 +337,16 @@ class Member: self.port_map = {} """ :type : dict[str, Port] """ - self.member_public_ip = None + self.member_public_ips = None """ :type : str """ + self.member_default_public_ip = None + """ :type : str """ self.status = None """ :type : str """ - self.member_ip = None + self.member_private_ips = None """ :type : str """ + self.member_default_private_ip = None + """ :type : str """ self.properties = {} """ :type : dict[str, str] """ self.lb_cluster_id = None http://git-wip-us.apache.org/repos/asf/stratos/blob/9a355d9a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/extensionutils.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/extensionutils.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/extensionutils.py index 22639d3..83c827c 100644 --- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/extensionutils.py +++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/extensionutils.py @@ -463,7 +463,7 @@ def get_lb_member_ip(lb_cluster_id): members = cluster.get_members() for member in members: if member.cluster_id == lb_cluster_id: - return [member.member_ip, member.member_public_ip] + return [member.member_default_private_ip, member.member_default_public_ip] return None
