Repository: ambari Updated Branches: refs/heads/trunk e6983857b -> 8ce722c82
AMBARI-21507 ADDENDUM Log Search Solr output properties should be provided by the Config API (mgergely) Change-Id: I9ce21f80202f3b4e0d4d88f04c41fd0058970e49 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8ce722c8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8ce722c8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8ce722c8 Branch: refs/heads/trunk Commit: 8ce722c82c4886862466cb897301633d146d1fce Parents: e698385 Author: Miklos Gergely <mgerg...@hortonworks.com> Authored: Thu Jul 27 19:12:42 2017 +0200 Committer: Miklos Gergely <mgerg...@hortonworks.com> Committed: Thu Jul 27 19:12:42 2017 +0200 ---------------------------------------------------------------------- .../LOGSEARCH/test_service_advisor.py | 30 +++----------------- 1 file changed, 4 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8ce722c8/ambari-server/src/test/python/common-services/LOGSEARCH/test_service_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/common-services/LOGSEARCH/test_service_advisor.py b/ambari-server/src/test/python/common-services/LOGSEARCH/test_service_advisor.py index 3edb03c..4c35f28 100644 --- a/ambari-server/src/test/python/common-services/LOGSEARCH/test_service_advisor.py +++ b/ambari-server/src/test/python/common-services/LOGSEARCH/test_service_advisor.py @@ -43,12 +43,6 @@ class TestLOGSEARCH050ServiceAdvisor(TestCase): def test_recommendLogsearchConfiguration(self): configurations = { "logsearch-properties": { - "properties": { - "logsearch.collection.service.logs.numshards" : "5", - "logsearch.collection.service.logs.replication.factor": "0", - "logsearch.collection.audit.logs.numshards" : "5", - "logsearch.collection.audit.logs.replication.factor": "0" - } } } @@ -61,10 +55,12 @@ class TestLOGSEARCH050ServiceAdvisor(TestCase): "ramPerContainer": 256 } expected = { + 'logsearch-properties': { + 'properties': {} + }, 'logfeeder-env': { 'property_attributes': { - 'logfeeder_external_solr_kerberos_keytab': {'visible': 'false' - }, + 'logfeeder_external_solr_kerberos_keytab': {'visible': 'false'}, 'logfeeder_external_solr_kerberos_principal': {'visible': 'false'} } }, @@ -81,24 +77,6 @@ class TestLOGSEARCH050ServiceAdvisor(TestCase): 'logsearch_external_solr_kerberos_keytab': {'visible': 'false'}, 'logsearch_external_solr_kerberos_principal': {'visible': 'false'} } - }, - 'logsearch-properties': { - 'properties': { - "logsearch.collection.service.logs.numshards" : "2", - "logsearch.collection.service.logs.replication.factor": "1", - "logsearch.collection.audit.logs.numshards" : "2", - "logsearch.collection.audit.logs.replication.factor": "1" - }, - "property_attributes": { - "logsearch.collection.service.logs.numshards": { - "minimum": "1", - "maximum": "3" - }, - "logsearch.collection.audit.logs.numshards": { - "minimum": "1", - "maximum": "3" - } - } } } services = {
