You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/02/07 10:37:30 UTC
[14/14] stratos git commit: Code cleanup - PCA
Code cleanup - PCA
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5b16aec0
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5b16aec0
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5b16aec0
Branch: refs/heads/master
Commit: 5b16aec09df172d3a65be4594b998cc413fdd0dd
Parents: 705bd57
Author: Chamila de Alwis <ch...@wso2.com>
Authored: Sat Feb 7 01:00:31 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Feb 7 15:07:08 2015 +0530
----------------------------------------------------------------------
.../extensions/defaultextensionhandler.py | 15 +++---
.../cartridgeagent/tests/test_git.py | 54 ++------------------
2 files changed, 13 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b16aec0/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 1aa67fe..cb7ba57 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
@@ -33,7 +33,6 @@ class DefaultExtensionHandler(AbstractExtensionHandler):
def __init__(self):
self.log = LogFactory().get_log(__name__)
- self.wk_members = []
self.cartridge_agent_config = CartridgeAgentConfiguration()
def on_instance_started_event(self):
@@ -57,8 +56,10 @@ class DefaultExtensionHandler(AbstractExtensionHandler):
repo_path += git_local_repo_path
if super_tenant_repo_path is not None and super_tenant_repo_path != "":
- super_tenant_repo_path = super_tenant_repo_path if super_tenant_repo_path.startswith("/") else "/" + super_tenant_repo_path
- super_tenant_repo_path = super_tenant_repo_path if super_tenant_repo_path.endswith("/") else super_tenant_repo_path + "/"
+ super_tenant_repo_path = super_tenant_repo_path if super_tenant_repo_path.startswith("/") \
+ else "/" + super_tenant_repo_path
+ super_tenant_repo_path = super_tenant_repo_path if super_tenant_repo_path.endswith("/") \
+ else super_tenant_repo_path + "/"
# "app_path/repository/deploy/server/"
repo_path += super_tenant_repo_path
else:
@@ -120,7 +121,6 @@ class DefaultExtensionHandler(AbstractExtensionHandler):
# checkout code
subscribe_run, repo_context = agentgithandler.AgentGitHandler.checkout(repo_info)
- # repo_context = checkout_result["repo_context"]
# execute artifact updated extension
env_params = {"STRATOS_ARTIFACT_UPDATED_CLUSTER_ID": artifacts_updated_event.cluster_id,
"STRATOS_ARTIFACT_UPDATED_TENANT_ID": artifacts_updated_event.tenant_id,
@@ -157,7 +157,7 @@ class DefaultExtensionHandler(AbstractExtensionHandler):
self.log.info("Auto Commit is turned %r " % ("on" if auto_commit else "off"))
self.log.info("Auto Checkout is turned %r " % ("on" if auto_checkout else "off"))
- agentgithandler.AgentGitHandler.schedule_artifact_update_scheduled_task(
+ agentgithandler.AgentGitHandler.schedule_artifact_update_task(
repo_info,
auto_checkout,
auto_commit,
@@ -301,8 +301,9 @@ class DefaultExtensionHandler(AbstractExtensionHandler):
cluster_id_in_payload = self.cartridge_agent_config.cluster_id
member_id_in_payload = self.cartridge_agent_config.member_id
- topology_consistant = extensionutils.check_member_state_in_topology(service_name_in_payload, cluster_id_in_payload,
- member_id_in_payload)
+ topology_consistant = extensionutils.check_member_state_in_topology(service_name_in_payload,
+ cluster_id_in_payload,
+ member_id_in_payload)
if not topology_consistant:
self.log.error("Member has not initialized, failed to execute start server event")
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b16aec0/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/tests/test_git.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/tests/test_git.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/tests/test_git.py
index 4c6aad0..f201285 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/tests/test_git.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/tests/test_git.py
@@ -33,7 +33,6 @@ def test_clone(input, expected):
repo_string = f.read()
repo_info = json.loads(repo_string, object_hook=repo_object_decoder)
- # test_info = json.loads(repo_string)
sub_run, repo_context = AgentGitHandler.checkout(repo_info)
assert sub_run, "Not detected as subscription run"
@@ -41,54 +40,6 @@ def test_clone(input, expected):
result, msg = verify_git_repo(repo_info)
assert result == expected, msg
-# def test_simple_clone():
-# with open("conf/simple_repo.json", "r") as f:
-# repo_string = f.read()
-#
-# repo_info = json.loads(repo_string, object_hook=repo_object_decoder)
-# # test_info = json.loads(repo_string)
-# sub_run, repo_context = AgentGitHandler.checkout(repo_info)
-#
-# assert sub_run, "Not detected as subscription run"
-#
-# result, msg = verify_git_repo(repo_info)
-# assert result, msg
-#
-#
-# def test_auth_clone():
-# with open("conf/auth_repo.json", "r") as f:
-# repo_string = f.read()
-#
-# repo_info = json.loads(repo_string, object_hook=repo_object_decoder)
-# # test_info = json.loads(repo_string)
-# sub_run, repo_context = AgentGitHandler.checkout(repo_info)
-#
-# assert sub_run, "Not detected as subscription run"
-#
-# result, msg = verify_git_repo(repo_info)
-# assert result, msg
-#
-#
-# def test_auth_clone2():
-# with open("conf/auth_repo2.json", "r") as f:
-# repo_string = f.read()
-#
-# repo_info = json.loads(repo_string, object_hook=repo_object_decoder)
-# # test_info = json.loads(repo_string)
-# sub_run, repo_context = AgentGitHandler.checkout(repo_info)
-#
-# assert sub_run, "Not detected as subscription run"
-#
-# result, msg = verify_git_repo(repo_info)
-# assert result, msg
-
-
-# def test_push():
-# with open("conf/simple_repo.json", "r") as f:
-# repo_string = f.read()
-#
-# repo_info = json.loads(repo_string, object_hook=repo_object_decoder)
-
def setup_module(module):
# clear the temp folder path to clone new folders
@@ -104,6 +55,11 @@ def setup_module(module):
def verify_git_repo(repo_info):
+ """
+ Assert the status of the git repository
+ :param repo_info:
+ :return:
+ """
if not os.path.isdir(repo_info.repo_path):
return False, "Local repository directory not created."