Move collector server url to settings.yaml

Since we don't have different collector servers anymore we can move
url to settings.yaml to avoid hardcoded values in code.

Change-Id: Ic1e1a29e0bc6ccccbdc50fe219197430c6efd012
Closes-Bug: #1556773
This commit is contained in:
Fedor Zhadaev 2016-03-14 10:39:26 +03:00
parent f58ac5fc7f
commit 344683bbe2
3 changed files with 3 additions and 4 deletions

View File

@ -78,6 +78,7 @@ RPC_CONSUMER_LOG_PATH: "/var/log/nailgun/receiverd.log"
ASSASSIN_LOG_PATH: "/var/log/nailgun/assassind.log"
COLLECTOR_SERVER: "collector.fuel-infra.org"
COLLECTOR_ACTION_LOGS_URL: "https://{collector_server}/api/v1/action_logs/"
COLLECTOR_INST_INFO_URL: "https://{collector_server}/api/v1/installation_structure/"
COLLECTOR_OSWL_INFO_URL: "https://{collector_server}/api/v1/oswl_stats/"

View File

@ -38,11 +38,9 @@ logger = logging.getLogger('statistics')
class StatsSender(object):
COLLECTOR_COMMUNITY_SERVER = "collector.fuel-infra.org"
def build_collector_url(self, url_template):
return getattr(settings, url_template)\
.format(collector_server=self.COLLECTOR_COMMUNITY_SERVER)
.format(collector_server=settings.COLLECTOR_SERVER)
def ping_collector(self):
try:

View File

@ -53,7 +53,7 @@ class TestStatisticsSender(BaseTestCase):
@patch.dict('nailgun.settings.settings.VERSION', FEATURE_EXPERIMENTAL)
def test_community_collector_urls(self):
self.check_collector_urls(StatsSender.COLLECTOR_COMMUNITY_SERVER)
self.check_collector_urls(settings.COLLECTOR_SERVER)
@patch('nailgun.statistics.statsenderd.requests.get')
def test_ping_ok(self, requests_get):