ambari git commit: AMBARI-12624. UpgradeHelper must provide command line arguments for Ambari Server port and desired http protocol settings (dlysnichenko)

[dm...@apache.org]

Repository: ambari
Updated Branches:
  refs/heads/trunk 2f950f9c2 -> a2e653594


AMBARI-12624. UpgradeHelper must provide command line arguments for Ambari Server port and desired http protocol settings (dlysnichenko)


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

Branch: refs/heads/trunk
Commit: a2e6535943671a8a16636a2eea054324e4ebc0c5
Parents: 2f950f9
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Mon Aug 3 20:18:51 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Mon Aug 3 20:18:51 2015 +0300

----------------------------------------------------------------------
 ambari-server/src/main/python/upgradeHelper.py     | 12 ++++++++++++
 ambari-server/src/test/python/TestUpgradeHelper.py |  6 +++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a2e65359/ambari-server/src/main/python/upgradeHelper.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/upgradeHelper.py b/ambari-server/src/main/python/upgradeHelper.py
index c38ce5f..14cef85 100644
--- a/ambari-server/src/main/python/upgradeHelper.py
+++ b/ambari-server/src/main/python/upgradeHelper.py
@@ -1869,6 +1869,8 @@ def main():
   parser.add_option('--toStack', default=None, help="stack version to upgrade to", dest="to_stack")
 
   parser.add_option('--hostname', default=None, help="Hostname for Ambari server", dest="hostname")
+  parser.add_option('--port', default='8080', help="Port number for Ambari server", dest="port")
+  parser.add_option('--https', default=False, action="store_false", dest="https", help="Use https protocol for connection to the server")
   parser.add_option('--user', default=None, help="Ambari admin user", dest="user")
   parser.add_option('--password', default=None, help="Ambari admin password", dest="password")
   parser.add_option('--clustername', default=None, help="Cluster name", dest="clustername")
@@ -1890,6 +1892,13 @@ def main():
     options.password = getpass.getpass("Please enter Ambari admin password: ")
     if options.password == "":
       options.warnings.append("Ambari admin user's password name must be provided (e.g. admin)")
+
+  if options.https:
+    Options.API_PROTOCOL = "https"
+
+  if options.port:
+    Options.API_PORT = str(options.port)
+
   action = args[0]
 
   # check params according to executed action
@@ -1941,6 +1950,9 @@ if __name__ == "__main__":
   except (KeyboardInterrupt, EOFError):
     print("\nAborting ... Keyboard Interrupt.")
     sys.exit(1)
+  except HTTPError as e:
+    print("\nResponse error, " + str(e))
+    sys.exit(1)
   except FatalException as e:
     if e.reason is not None:
       error = "Exiting with exit code {0}. Reason: {1}".format(e.code, e.reason)

http://git-wip-us.apache.org/repos/asf/ambari/blob/a2e65359/ambari-server/src/test/python/TestUpgradeHelper.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/TestUpgradeHelper.py b/ambari-server/src/test/python/TestUpgradeHelper.py
index 5aca13d..9de2ed1 100644
--- a/ambari-server/src/test/python/TestUpgradeHelper.py
+++ b/ambari-server/src/test/python/TestUpgradeHelper.py
@@ -102,7 +102,6 @@ class TestUpgradeHelper(TestCase):
       resp = json.loads(resp)
     return resp
 
-
   def tearDown(self):
     sys.stdout = sys.__stdout__
 
@@ -120,6 +119,8 @@ class TestUpgradeHelper(TestCase):
       to_stack = "1.3"
       logfile = "test.log"
       report = "report.txt"
+      https = False
+      port = "8080"
       warnings = []
       printonly = False
 
@@ -130,6 +131,9 @@ class TestUpgradeHelper(TestCase):
     option_parser_mock.return_value = test_mock
 
     upgradeHelper.main()
+
+    self.assertEqual("8080", upgradeHelper.Options.API_PORT)
+    self.assertEqual("http", upgradeHelper.Options.API_PROTOCOL)
     self.assertEqual(1, modify_action_mock.call_count)
     self.assertEqual({"user": options.user, "pass": options.password}, upgradeHelper.Options.API_TOKENS)
     self.assertEqual(options.clustername, upgradeHelper.Options.CLUSTER_NAME)