From 3549f353f041c6133eeb970327e450d0aa0cf063 Mon Sep 17 00:00:00 2001 From: nitishkrishna Date: Fri, 8 Apr 2016 12:13:37 -0700 Subject: [PATCH] Partial-Bug: #1567582 - SM Backend must prevent provision if domain not specified We check if domain is specified at least for server or cluster. If not, provision doesn't go through. In hand with this, UI omits this check. Change-Id: I8074df601b389971968eb6f35f7b932b73bab088 --- src/server_mgr_main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server_mgr_main.py b/src/server_mgr_main.py index f06cf9d8..b7afe1c1 100755 --- a/src/server_mgr_main.py +++ b/src/server_mgr_main.py @@ -4102,7 +4102,9 @@ def provision_server(self): provision_params['domain'] = server['domain'] else: provision_params['domain'] = cluster_params['domain'] - + if not provision_params['domain']: + msg = "No Domain specified either for server " + provision_params['server_id'] + " or cluster " + server["cluster_id"] + self.log_and_raise_exception(msg) provision_params['rmq_master'] = role_ids['config'][0] provision_params['uuid'] = cluster_params['uuid'] provision_params['smgr_ip'] = self._args.listen_ip_addr