Fixed issues observed in testing in an OpenStack environment in cartridge agent
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0b73a8f7 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0b73a8f7 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0b73a8f7 Branch: refs/heads/master Commit: 0b73a8f7d432bec9b8b725f56ed5ddf5a3ff6361 Parents: 2261bbe Author: Chamila de Alwis <[email protected]> Authored: Thu Oct 9 12:25:04 2014 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Thu Oct 9 15:41:35 2014 +0530 ---------------------------------------------------------------------- tools/python-cartridge-agent/cartridge-agent/agent.py | 7 ------- tools/python-cartridge-agent/cartridge-agent/logging.ini | 4 ++-- .../cartridge-agent/modules/datapublisher/logpublisher.py | 3 ++- .../cartridge-agent/modules/event/topology/events.py | 3 +++ .../modules/extensions/defaultextensionhandler.py | 4 ++-- .../cartridge-agent/modules/topology/topologycontext.py | 8 +++++--- .../cartridge-agent/modules/util/log.py | 2 +- 7 files changed, 15 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/0b73a8f7/tools/python-cartridge-agent/cartridge-agent/agent.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/agent.py b/tools/python-cartridge-agent/cartridge-agent/agent.py index 8ba2740..1d16c99 100644 --- a/tools/python-cartridge-agent/cartridge-agent/agent.py +++ b/tools/python-cartridge-agent/cartridge-agent/agent.py @@ -121,13 +121,6 @@ class CartridgeAgent(threading.Thread): Checks if required properties are set :return: void """ - # JNDI_PROPERTIES_DIR - try: - self.cartridge_agent_config.read_property(cartridgeagentconstants.JNDI_PROPERTIES_DIR) - except ParameterNotFoundException: - self.log.error("System property not found: %r" % cartridgeagentconstants.JNDI_PROPERTIES_DIR) - return - #PARAM_FILE_PATH try: self.cartridge_agent_config.read_property(cartridgeagentconstants.PARAM_FILE_PATH) http://git-wip-us.apache.org/repos/asf/stratos/blob/0b73a8f7/tools/python-cartridge-agent/cartridge-agent/logging.ini ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/logging.ini b/tools/python-cartridge-agent/cartridge-agent/logging.ini index 3fd9381..c3e9e2c 100644 --- a/tools/python-cartridge-agent/cartridge-agent/logging.ini +++ b/tools/python-cartridge-agent/cartridge-agent/logging.ini @@ -6,7 +6,7 @@ format=%(asctime)s:%(levelname)s:%(message)s class=logging.Formatter [handlers] -keys=console, error_file +keys=console, error_file, log_file [handler_console] class=logging.StreamHandler @@ -31,4 +31,4 @@ keys=root [logger_root] level=DEBUG formatter=default -handlers=console,error_file \ No newline at end of file +handlers=console,error_file,log_file \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/0b73a8f7/tools/python-cartridge-agent/cartridge-agent/modules/datapublisher/logpublisher.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/datapublisher/logpublisher.py b/tools/python-cartridge-agent/cartridge-agent/modules/datapublisher/logpublisher.py index ea30c85..f58b6eb 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/datapublisher/logpublisher.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/datapublisher/logpublisher.py @@ -221,9 +221,10 @@ class DataPublisherConfiguration: self.monitoring_server_secure_port = None self.admin_username = None self.admin_password = None + self.cartridge_agent_config = CartridgeAgentConfiguration() + self.read_config() - self.cartridge_agent_config = CartridgeAgentConfiguration() def read_config(self): self.enabled = True if self.cartridge_agent_config.read_property(cartridgeagentconstants.MONITORING_PUBLISHER_ENABLED, False).strip().lower() == "true" else False http://git-wip-us.apache.org/repos/asf/stratos/blob/0b73a8f7/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 5f37784..2886099 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 @@ -181,6 +181,9 @@ class CompleteTopologyEvent: return instance + def get_topology(self): + return self.topology + class MemberStartedEvent: http://git-wip-us.apache.org/repos/asf/stratos/blob/0b73a8f7/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py b/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py index 58a5aa7..c91a559 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py @@ -209,9 +209,9 @@ class DefaultExtensionHandler(AbstractExtensionHandler): self.log.debug("Complete tenant event received") tenant_list_json = complete_tenant_event.tenant_list_json - self.log.debug("Complete tenants:" + tenant_list_json) + self.log.debug("Complete tenants:" + ','.join(tenant_list_json)) - env_params = {"STRATOS_TENANT_LIST_JSON": tenant_list_json} + env_params = {"STRATOS_TENANT_LIST_JSON": ','.join(tenant_list_json)} extensionutils.execute_complete_tenant_extension(env_params) http://git-wip-us.apache.org/repos/asf/stratos/blob/0b73a8f7/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 21972ef..81314d2 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/topology/topologycontext.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/topology/topologycontext.py @@ -176,7 +176,7 @@ class Cluster: Represents a cluster for a service """ - def __init__(self, service_name, cluster_id, deployment_policy_name, autoscale_policy_name): + def __init__(self, service_name="", cluster_id="", deployment_policy_name="", autoscale_policy_name=""): self.service_name = service_name """ :type : str """ self.cluster_id = cluster_id @@ -298,12 +298,13 @@ class Cluster: if not valid: raise RuntimeError("Tenant range %r is not valid" % tenant_range) + class Member: """ Represents a member on a particular cluster """ - def __init__(self, service_name, cluster_id, network_partition_id, parition_id, member_id): + def __init__(self, service_name="", cluster_id="", network_partition_id="", parition_id="", member_id=""): self.service_name = service_name """ :type : str """ self.cluster_id = cluster_id @@ -430,4 +431,5 @@ class TopologyContext: @staticmethod def update(topology): - TopologyContext.topology = topology \ No newline at end of file + TopologyContext.topology = topology + TopologyContext.topology.initialized = True \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/0b73a8f7/tools/python-cartridge-agent/cartridge-agent/modules/util/log.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/util/log.py b/tools/python-cartridge-agent/cartridge-agent/modules/util/log.py index b6fec95..ff8e9d4 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/util/log.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/util/log.py @@ -35,4 +35,4 @@ class LogFactory(object): :return: The logger class :rtype: RootLogger """ - self.instance.get_log(name) \ No newline at end of file + return self.instance.get_log(name) \ No newline at end of file
