This is an automated email from the ASF dual-hosted git repository.

rlevas pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 2e81537  AMBARI-22865. Moving out get_service_component_meta to 
DefaultStackAdvisor so that all children can use this function
2e81537 is described below

commit 2e8153727cb4c2812fe1cb20bfc5326eb5dabb7c
Author: Sandor Molnar <[email protected]>
AuthorDate: Mon Jan 29 21:00:22 2018 +0100

    AMBARI-22865. Moving out get_service_component_meta to DefaultStackAdvisor 
so that all children can use this function
---
 .../stacks/HDP/2.0.6/services/stack_advisor.py     | 49 ----------------------
 .../src/main/resources/stacks/stack_advisor.py     | 48 +++++++++++++++++++++
 2 files changed, 48 insertions(+), 49 deletions(-)

diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index 7e9ed44..3ee7af5 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -809,55 +809,6 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
       parentValidators[service].update(configsDict)
 
 
-  def get_service_component_meta(self, service, component, services):
-    """
-    Function retrieve service component meta information as dict from 
services.json
-    If no service or component found, would be returned empty dict
-
-    Return value example:
-        "advertise_version" : true,
-        "bulk_commands_display_name" : "",
-        "bulk_commands_master_component_name" : "",
-        "cardinality" : "1+",
-        "component_category" : "CLIENT",
-        "component_name" : "HBASE_CLIENT",
-        "custom_commands" : [ ],
-        "decommission_allowed" : false,
-        "display_name" : "HBase Client",
-        "has_bulk_commands_definition" : false,
-        "is_client" : true,
-        "is_master" : false,
-        "reassign_allowed" : false,
-        "recovery_enabled" : false,
-        "service_name" : "HBASE",
-        "stack_name" : "HDP",
-        "stack_version" : "2.5",
-        "hostnames" : [ "host1", "host2" ]
-
-    :type service str
-    :type component str
-    :type services dict
-    :rtype dict
-    """
-    __stack_services = "StackServices"
-    __stack_service_components = "StackServiceComponents"
-
-    if not services:
-      return {}
-
-    service_meta = [item for item in services["services"] if 
item[__stack_services]["service_name"] == service]
-    if len(service_meta) == 0:
-      return {}
-
-    service_meta = service_meta[0]
-    component_meta = [item for item in service_meta["components"] if 
item[__stack_service_components]["component_name"] == component]
-
-    if len(component_meta) == 0:
-      return {}
-
-    return component_meta[0][__stack_service_components]
-
-
   def get_components_list(self, service, services):
     """
     Return list of components for specific service
diff --git a/ambari-server/src/main/resources/stacks/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/stack_advisor.py
index 0dcfff8..23c0786 100644
--- a/ambari-server/src/main/resources/stacks/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/stack_advisor.py
@@ -2295,6 +2295,54 @@ class DefaultStackAdvisor(StackAdvisor):
 
     return [service["StackServices"]["service_name"] for service in 
services["services"]]
 
+  def get_service_component_meta(self, service, component, services):
+    """
+    Function retrieve service component meta information as dict from 
services.json
+    If no service or component found, would be returned empty dict
+
+    Return value example:
+        "advertise_version" : true,
+        "bulk_commands_display_name" : "",
+        "bulk_commands_master_component_name" : "",
+        "cardinality" : "1+",
+        "component_category" : "CLIENT",
+        "component_name" : "HBASE_CLIENT",
+        "custom_commands" : [ ],
+        "decommission_allowed" : false,
+        "display_name" : "HBase Client",
+        "has_bulk_commands_definition" : false,
+        "is_client" : true,
+        "is_master" : false,
+        "reassign_allowed" : false,
+        "recovery_enabled" : false,
+        "service_name" : "HBASE",
+        "stack_name" : "HDP",
+        "stack_version" : "2.5",
+        "hostnames" : [ "host1", "host2" ]
+
+    :type service str
+    :type component str
+    :type services dict
+    :rtype dict
+    """
+    __stack_services = "StackServices"
+    __stack_service_components = "StackServiceComponents"
+
+    if not services:
+      return {}
+
+    service_meta = [item for item in services["services"] if 
item[__stack_services]["service_name"] == service]
+    if len(service_meta) == 0:
+      return {}
+
+    service_meta = service_meta[0]
+    component_meta = [item for item in service_meta["components"] if 
item[__stack_service_components]["component_name"] == component]
+
+    if len(component_meta) == 0:
+      return {}
+
+    return component_meta[0][__stack_service_components]
+
   #region HDFS
   def getHadoopProxyUsersValidationItems(self, properties, services, hosts, 
configurations):
     validationItems = []

-- 
To stop receiving notification emails like this one, please contact
[email protected].

Reply via email to