AMBARI-22453. ambari-server setup should surface GPL software agreement (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/46237fe3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/46237fe3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/46237fe3 Branch: refs/heads/branch-2.6 Commit: 46237fe37b518a4eb0f3094d8c91867877b68094 Parents: 81439af Author: Andrew Onishuk <[email protected]> Authored: Thu Nov 16 18:00:09 2017 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Thu Nov 16 18:00:09 2017 +0200 ---------------------------------------------------------------------- .../ambari/server/configuration/Configuration.java | 11 +++++------ ambari-server/src/main/python/ambari-server.py | 4 ++-- .../controller/AmbariManagementControllerImplTest.java | 3 ++- .../internal/ClientConfigResourceProviderTest.java | 2 ++ 4 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/46237fe3/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java index 085f420..2590a83 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java @@ -726,13 +726,12 @@ public class Configuration { "server.version.file", null); /** - * The full path to the file which contains the Ambari Server version. + * Whether user accepted GPL license */ @Markdown( - description = "Whether user accepted GPL license.", - examples = { "true", "false" }) - public static final ConfigurationProperty<String> GPL_LICENSE_ACCEPTED = new ConfigurationProperty<>( - "gpl.license.accepted", null); + description = "Whether user accepted GPL license.") + public static final ConfigurationProperty<Boolean> GPL_LICENSE_ACCEPTED = new ConfigurationProperty<>( + "gpl.license.accepted", false); /** * The location of the JDK on the Ambari Agent hosts. @@ -5329,7 +5328,7 @@ public class Configuration { } public Boolean getGplLicenseAccepted(){ - return getProperty(GPL_LICENSE_ACCEPTED).toLowerCase().equals("true"); + return Boolean.valueOf(getProperty(GPL_LICENSE_ACCEPTED)); } public String getAgentStackRetryOnInstallCount(){ http://git-wip-us.apache.org/repos/asf/ambari/blob/46237fe3/ambari-server/src/main/python/ambari-server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py index 6d242a3..3a67532 100755 --- a/ambari-server/src/main/python/ambari-server.py +++ b/ambari-server/src/main/python/ambari-server.py @@ -409,7 +409,7 @@ def init_parser_options(parser): parser.add_option('--skip-database-check', action="store_true", default=False, help="Skip database consistency check", dest="skip_database_check") parser.add_option('--skip-view-extraction', action="store_true", default=False, help="Skip extraction of system views", dest="skip_view_extraction") parser.add_option('--auto-fix-database', action="store_true", default=False, help="Automatically fix database consistency issues", dest="fix_database_consistency") - parser.add_option('--accept-gpl', action="store_true", default=False, help="Automatically accepts GPL license", dest="accept_gpl") + parser.add_option('--enable-lzo-under-gpl-license', action="store_true", default=False, help="Automatically accepts GPL license", dest="accept_gpl") add_parser_options('--mpack', default=None, help="Specify the path for management pack to be installed/upgraded", @@ -513,7 +513,7 @@ def init_parser_options(parser): parser.add_option('--skip-database-check', action="store_true", default=False, help="Skip database consistency check", dest="skip_database_check") parser.add_option('--skip-view-extraction', action="store_true", default=False, help="Skip extraction of system views", dest="skip_view_extraction") parser.add_option('--auto-fix-database', action="store_true", default=False, help="Automatically fix database consistency issues", dest="fix_database_consistency") - parser.add_option('--accept-gpl', action="store_true", default=False, help="Automatically accepts GPL license", dest="accept_gpl") + parser.add_option('--enable-lzo-under-gpl-license', action="store_true", default=False, help="Automatically accepts GPL license", dest="accept_gpl") parser.add_option('--force-version', action="store_true", default=False, help="Force version to current", dest="force_repo_version") parser.add_option('--version', dest="stack_versions", default=None, action="append", type="string", help="Specify stack version that needs to be enabled. All other stacks versions will be disabled") http://git-wip-us.apache.org/repos/asf/ambari/blob/46237fe3/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java index c857008..00b87a6 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java @@ -2082,6 +2082,7 @@ public class AmbariManagementControllerImplTest { expect(configuration.getServerDBName()).andReturn(SERVER_DB_NAME); expect(configuration.getJavaVersion()).andReturn(8); expect(configuration.areHostsSysPrepped()).andReturn("true"); + expect(configuration.getGplLicenseAccepted()).andReturn(false); expect(configuration.getDatabaseConnectorNames()).andReturn(new HashMap<String, String>()).anyTimes(); expect(configuration.getPreviousDatabaseConnectorNames()).andReturn(new HashMap<String, String>()).anyTimes(); expect(repositoryVersionEntity.getVersion()).andReturn("1234").anyTimes(); @@ -2129,7 +2130,7 @@ public class AmbariManagementControllerImplTest { Map<String, String> defaultHostParams = helper.createDefaultHostParams(cluster, repositoryVersionEntity.getStackId()); - assertEquals(15, defaultHostParams.size()); + assertEquals(16, defaultHostParams.size()); assertEquals(MYSQL_JAR, defaultHostParams.get(DB_DRIVER_FILENAME)); assertEquals(SOME_STACK_NAME, defaultHostParams.get(STACK_NAME)); assertEquals(SOME_STACK_VERSION, defaultHostParams.get(STACK_VERSION)); http://git-wip-us.apache.org/repos/asf/ambari/blob/46237fe3/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java index 9de5795..8c89daa 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java @@ -276,6 +276,7 @@ public class ClientConfigResourceProviderTest { expect(configuration.areHostsSysPrepped()).andReturn("false"); expect(configuration.isAgentStackRetryOnInstallEnabled()).andReturn("false"); expect(configuration.getAgentStackRetryOnInstallCount()).andReturn("5"); + expect(configuration.getGplLicenseAccepted()).andReturn(Configuration.GPL_LICENSE_ACCEPTED.getDefaultValue()); expect(configuration.getExternalScriptThreadPoolSize()).andReturn(Configuration.THREAD_POOL_SIZE_FOR_EXTERNAL_SCRIPT.getDefaultValue()); expect(configuration.getExternalScriptTimeout()).andReturn(Configuration.EXTERNAL_SCRIPT_TIMEOUT.getDefaultValue()); Map<String,String> props = new HashMap<String, String>(); @@ -528,6 +529,7 @@ public class ClientConfigResourceProviderTest { expect(configuration.areHostsSysPrepped()).andReturn("false"); expect(configuration.isAgentStackRetryOnInstallEnabled()).andReturn("false"); expect(configuration.getAgentStackRetryOnInstallCount()).andReturn("5"); + expect(configuration.getGplLicenseAccepted()).andReturn(Configuration.GPL_LICENSE_ACCEPTED.getDefaultValue()); expect(configuration.getExternalScriptThreadPoolSize()).andReturn(Configuration.THREAD_POOL_SIZE_FOR_EXTERNAL_SCRIPT.getDefaultValue()); expect(configuration.getExternalScriptTimeout()).andReturn(Configuration.EXTERNAL_SCRIPT_TIMEOUT.getDefaultValue());
