You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/11/11 13:00:26 UTC

[1/3] stratos git commit: Python Agent: Updated topology object creation from json Puppet: Python agent's module now creates the extension log folder and touches the file

Repository: stratos
Updated Branches:
  refs/heads/master 340f8486a -> 61dc10a0d


Python Agent: Updated topology object creation from json
Puppet: Python agent's module now creates the extension log folder and touches the file


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b67eafbf
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b67eafbf
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b67eafbf

Branch: refs/heads/master
Commit: b67eafbf544975763ccc58feac48ce1b4dc9be30
Parents: 48af1a1
Author: Chamila de Alwis <cs...@chamiladealwis.com>
Authored: Tue Nov 11 17:08:11 2014 +0530
Committer: Chamila de Alwis <cs...@chamiladealwis.com>
Committed: Tue Nov 11 17:08:11 2014 +0530

----------------------------------------------------------------------
 .../cartridgeagent/modules/event/topology/events.py  |  7 ++++---
 tools/puppet3/modules/python_agent/manifests/init.pp | 15 +++++++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/b67eafbf/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 150f1d1..a3c9448 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
@@ -170,9 +170,10 @@ class CompleteTopologyEvent:
                     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"]
+                    #TODO: remove status
+                    cluster_obj.status = cluster_str["status"] if "status" in cluster_str else None
                     cluster_obj.load_balancer_algorithm_name = cluster_str["loadBalanceAlgorithmName"] if "loadBalanceAlgorithmName" in cluster_str else None
-                    cluster_obj.properties = cluster_str["properties"]
+                    cluster_obj.properties = cluster_str["properties"] if "properties" in cluster_str else None
                     cluster_obj.member_list_json = cluster_str["memberMap"]
 
                     #add member map
@@ -185,7 +186,7 @@ class CompleteTopologyEvent:
 
                         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.status = member_str["status"]
+                        member_obj.status = member_str["status"] if "status" in cluster_str else None
                         member_obj.member_ip = member_str["memberIp"]
                         member_obj.properties = member_str["properties"]
                         member_obj.lb_cluster_id = member_str["lbClusterId"] if "lbClusterId" in member_str else None

http://git-wip-us.apache.org/repos/asf/stratos/blob/b67eafbf/tools/puppet3/modules/python_agent/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/python_agent/manifests/init.pp b/tools/puppet3/modules/python_agent/manifests/init.pp
index 29f5c97..0e91ece 100644
--- a/tools/puppet3/modules/python_agent/manifests/init.pp
+++ b/tools/puppet3/modules/python_agent/manifests/init.pp
@@ -79,6 +79,17 @@ class python_agent(
     require => Python_agent::Initialize[$service_code];
   }
 
+  exec { 'make extension log folder':
+    path    => '/bin/',
+    command => "mkdir -p /var/log/apache-stratos",
+    require => Exec['make extension folder'];
+  }
+
+  exec { 'make extension log file':
+    path    => '/bin/',
+    command => "touch /var/log/apache-stratos/cartridge-agent-extensions.log",
+    require => Exec['make extension log folder'];
+  }
 
 # excluding templates which are not needed by a cartridge module from default_templates
   $default_templates_excluded = difference($default_templates,$exclude_templates)
@@ -94,7 +105,7 @@ class python_agent(
     $service_templates:
       target    => $agent_home,
       template_dir => "agent",
-      require   => Exec['make extension folder'];
+      require   => Exec['make extension log file'];
   }
 
 # applying custom extensions
@@ -103,7 +114,7 @@ class python_agent(
       $custom_templates:
         target    => $agent_home,
         template_dir => "${module}/agent",
-        require   => [Exec['make extension folder']]
+        require   => [Exec['make extension log file']]
 	}
   }
 


[3/3] stratos git commit: Merge branch 'master' of https://github.com/chamilad/stratos

Posted by la...@apache.org.
Merge branch 'master' of https://github.com/chamilad/stratos


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/61dc10a0
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/61dc10a0
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/61dc10a0

Branch: refs/heads/master
Commit: 61dc10a0d0771e23e9dc71c99f902a550d78817b
Parents: 340f848 fe7fe4e
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Nov 11 17:31:11 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Nov 11 17:31:11 2014 +0530

----------------------------------------------------------------------
 .../cartridgeagent/modules/event/topology/events.py  |  7 ++++---
 tools/puppet3/modules/python_agent/manifests/init.pp | 15 +++++++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------



[2/3] stratos git commit: Python Agent: Fixed typo in topology event creation

Posted by la...@apache.org.
Python Agent: Fixed typo in topology event creation


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fe7fe4e3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fe7fe4e3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fe7fe4e3

Branch: refs/heads/master
Commit: fe7fe4e36939e8734423a1a97b701b3272bc3779
Parents: b67eafb
Author: Chamila de Alwis <cs...@chamiladealwis.com>
Authored: Tue Nov 11 17:10:28 2014 +0530
Committer: Chamila de Alwis <cs...@chamiladealwis.com>
Committed: Tue Nov 11 17:10:28 2014 +0530

----------------------------------------------------------------------
 .../cartridgeagent/cartridgeagent/modules/event/topology/events.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/fe7fe4e3/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 a3c9448..4b81558 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
@@ -186,7 +186,7 @@ class CompleteTopologyEvent:
 
                         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.status = member_str["status"] if "status" in cluster_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.properties = member_str["properties"]
                         member_obj.lb_cluster_id = member_str["lbClusterId"] if "lbClusterId" in member_str else None