You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/10/11 20:47:02 UTC
[38/50] [abbrv] git commit: Fixed optional parameters being read as
mandatory Fixed dependancy issue in extension handler Fixed deploymentPolicy,
partitionId, and networkPartitionId being read in a container env
Fixed optional parameters being read as mandatory
Fixed dependancy issue in extension handler
Fixed deploymentPolicy, partitionId, and networkPartitionId being read in a container env
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4955598b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4955598b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4955598b
Branch: refs/heads/master
Commit: 4955598b05f584bce24c8b2e0f7dfe4193a94c39
Parents: c3551c9
Author: Chamila de Alwis <ch...@wso2.com>
Authored: Sat Oct 11 17:34:39 2014 +0530
Committer: Chamila de Alwis <ch...@wso2.com>
Committed: Sat Oct 11 17:34:39 2014 +0530
----------------------------------------------------------------------
.../modules/config/cartridgeagentconfiguration.py | 14 +++++++-------
.../cartridge-agent/modules/event/topology/events.py | 6 +++---
.../modules/extensions/defaultextensionhandler.py | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4955598b/tools/python-cartridge-agent/cartridge-agent/modules/config/cartridgeagentconfiguration.py
----------------------------------------------------------------------
diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/config/cartridgeagentconfiguration.py b/tools/python-cartridge-agent/cartridge-agent/modules/config/cartridgeagentconfiguration.py
index 95c4169..6a0525e 100644
--- a/tools/python-cartridge-agent/cartridge-agent/modules/config/cartridgeagentconfiguration.py
+++ b/tools/python-cartridge-agent/cartridge-agent/modules/config/cartridgeagentconfiguration.py
@@ -98,7 +98,7 @@ class CartridgeAgentConfiguration:
self.__read_parameter_file()
try:
- service_group = self.payload_params[cartridgeagentconstants.SERVICE_GROUP] \
+ self.service_group = self.payload_params[cartridgeagentconstants.SERVICE_GROUP] \
if cartridgeagentconstants.SERVICE_GROUP in self.payload_params \
else None
@@ -112,12 +112,12 @@ class CartridgeAgentConfiguration:
self.service_name = self.read_property(cartridgeagentconstants.SERVICE_NAME)
self.cluster_id = self.read_property(cartridgeagentconstants.CLUSTER_ID)
- self.network_partition_id = self.read_property(cartridgeagentconstants.NETWORK_PARTITION_ID)
- self.partition_id = self.read_property(cartridgeagentconstants.PARTITION_ID)
+ self.network_partition_id = self.read_property(cartridgeagentconstants.NETWORK_PARTITION_ID, False)
+ self.partition_id = self.read_property(cartridgeagentconstants.PARTITION_ID, False)
self.member_id = self.get_member_id(cartridgeagentconstants.MEMBER_ID)
self.cartridge_key = self.read_property(cartridgeagentconstants.CARTRIDGE_KEY)
- self.app_path = self.read_property(cartridgeagentconstants.APP_PATH)
- self.repo_url = self.read_property(cartridgeagentconstants.REPO_URL)
+ self.app_path = self.read_property(cartridgeagentconstants.APP_PATH, False)
+ self.repo_url = self.read_property(cartridgeagentconstants.REPO_URL, False)
self.ports = str(self.read_property(cartridgeagentconstants.PORTS)).split("|")
try:
@@ -163,8 +163,8 @@ class CartridgeAgentConfiguration:
self.is_internal_repo = False
self.tenant_id = self.read_property(cartridgeagentconstants.TENANT_ID)
- self.lb_cluster_id = self.read_property(cartridgeagentconstants.LB_CLUSTER_ID)
- self.min_count = self.read_property(cartridgeagentconstants.MIN_INSTANCE_COUNT)
+ self.lb_cluster_id = self.read_property(cartridgeagentconstants.LB_CLUSTER_ID, False)
+ self.min_count = self.read_property(cartridgeagentconstants.MIN_INSTANCE_COUNT, False)
self.lb_private_ip = self.read_property(cartridgeagentconstants.LB_PRIVATE_IP, False)
self.lb_public_ip = self.read_property(cartridgeagentconstants.LB_PUBLIC_IP, False)
self.tenant_repository_path = self.read_property(cartridgeagentconstants.TENANT_REPO_PATH, False)
http://git-wip-us.apache.org/repos/asf/stratos/blob/4955598b/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 65a6cf2..e8853ec 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
@@ -156,7 +156,7 @@ class CompleteTopologyEvent:
cluster_str = service_str["clusterIdClusterMap"][cluster_id]
cl_service_name = cluster_str["serviceName"]
cl_autoscale_policy_name = cluster_str["autoscalePolicyName"]
- cl_deployment_policy_name = cluster_str["deploymentPolicyName"]
+ cl_deployment_policy_name = cluster_str["deploymentPolicyName"] if "deploymentPolicyName" in cluster_str else None
cluster_obj = Cluster(cl_service_name, cluster_id, cl_deployment_policy_name, cl_autoscale_policy_name)
cluster_obj.hostnames = cluster_str["hostNames"]
@@ -172,8 +172,8 @@ class CompleteTopologyEvent:
member_str = cluster_str["memberMap"][member_id]
mm_service_name = member_str["serviceName"]
mm_cluster_id = member_str["clusterId"]
- mm_network_partition_id = member_str["networkPartitionId"]
- mm_partition_id = member_str["partitionId"]
+ mm_network_partition_id = member_str["networkPartitionId"] if "networkPartitionId" in member_str else None
+ 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"]
http://git-wip-us.apache.org/repos/asf/stratos/blob/4955598b/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 b5e1d1e..4c36e55 100644
--- a/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py
+++ b/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py
@@ -18,6 +18,7 @@
import time
from abstractextensionhandler import AbstractExtensionHandler
+from ..util import extensionutils, cartridgeagentutils
class DefaultExtensionHandler(AbstractExtensionHandler):
@@ -754,7 +755,6 @@ class DefaultExtensionHandler(AbstractExtensionHandler):
from ..artifactmgt.git import agentgithandler
from ..artifactmgt.repositoryinformation import RepositoryInformation
from ..config.cartridgeagentconfiguration import CartridgeAgentConfiguration
-from ..util import extensionutils
from ..publisher import cartridgeagentpublisher
from ..exception.parameternotfoundexception import ParameterNotFoundException
from ..topology.topologycontext import *