[12/37] ambari git commit: AMBARI-22686. Disabled stack still appears in the UI if VDF is available. (swagle)

[ncole]

AMBARI-22686. Disabled stack still appears in the UI if VDF is available. 
(swagle)


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

Branch: refs/heads/branch-feature-AMBARI-21674
Commit: e404100b99ffac8f14e36b46770466deeb5760d7
Parents: 36d0271
Author: Siddharth Wagle 
Authored: Thu Dec 21 13:30:14 2017 -0800
Committer: Siddharth Wagle 
Committed: Thu Dec 21 13:30:14 2017 -0800

--
 .../server/api/services/AmbariMetaInfo.java | 12 
 .../server/api/services/AmbariMetaInfoTest.java | 32 ++--
 .../RepositoryVersionResourceProviderTest.java  |  5 +--
 3 files changed, 37 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e404100b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index b1eba8f..9fee0ae 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -139,7 +139,7 @@ public class AmbariMetaInfo {
   private File commonWidgetsDescriptorFile;
   private File customActionRoot;
   private String commonKerberosDescriptorFileLocation;
-  private Map versionDefinitions = null;
+  Map versionDefinitions = null;
 
 
   @Inject
@@ -1368,12 +1368,12 @@ public class AmbariMetaInfo {
 versionDefinitions = new HashMap<>();
 
 for (StackInfo stack : getStacks()) {
-  for (VersionDefinitionXml definition : stack.getVersionDefinitions()) {
-versionDefinitions.put(String.format("%s-%s-%s", stack.getName(),
-stack.getVersion(), definition.release.version), definition);
-  }
-
   if (stack.isActive() && stack.isValid()) {
+for (VersionDefinitionXml definition : stack.getVersionDefinitions()) {
+  versionDefinitions.put(String.format("%s-%s-%s", stack.getName(),
+stack.getVersion(), definition.release.version), definition);
+}
+
 try {
   // !!! check for a "latest-vdf" one.  This will be used for the 
default if one is not found.
   VersionDefinitionXml xml = stack.getLatestVersionDefinition();

http://git-wip-us.apache.org/repos/asf/ambari/blob/e404100b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
index 9285526..f98cffd 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
@@ -133,8 +133,7 @@ public class AmbariMetaInfoTest {
   private static final int OS_CNT = 4;
 
   private static TestAmbariMetaInfo metaInfo = null;
-  private final static Logger LOG =
-  LoggerFactory.getLogger(AmbariMetaInfoTest.class);
+  private final static Logger LOG = 
LoggerFactory.getLogger(AmbariMetaInfoTest.class);
   private static final String FILE_NAME = "hbase-site.xml";
   private static final String HADOOP_ENV_FILE_NAME = "hadoop-env.xml";
   private static final String HDFS_LOG4J_FILE_NAME = "hdfs-log4j.xml";
@@ -1902,6 +1901,35 @@ public class AmbariMetaInfoTest {
 Assert.assertEquals("src/test/resources/widgets.json", 
widgetsFile.getPath());
   }
 
+  @Test
+  public void testGetVersionDefinitionsForDisabledStack() throws 
AmbariException {
+Map versionDefinitions = 
metaInfo.getVersionDefinitions();
+Assert.assertNotNull(versionDefinitions);
+// Check presence
+Map.Entry vdfEntry = null;
+for (Map.Entry entry : 
versionDefinitions.entrySet()) {
+  if (entry.getKey().equals("HDP-2.2.1")) {
+vdfEntry = entry;
+  }
+}
+Assert.assertNotNull("Candidate stack and vdf for test case.", vdfEntry);
+StackInfo stackInfo = metaInfo.getStack("HDP", "2.2.1");
+// Strange that this is not immutable but works for this test !
+stackInfo.setActive(false);
+
+// Hate to use reflection hence 

[38/51] [abbrv] ambari git commit: AMBARI-22686. Disabled stack still appears in the UI if VDF is available. (swagle)

[amagyar]

AMBARI-22686. Disabled stack still appears in the UI if VDF is available. 
(swagle)


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

Branch: refs/heads/branch-feature-AMBARI-22008-isilon
Commit: e404100b99ffac8f14e36b46770466deeb5760d7
Parents: 36d0271
Author: Siddharth Wagle 
Authored: Thu Dec 21 13:30:14 2017 -0800
Committer: Siddharth Wagle 
Committed: Thu Dec 21 13:30:14 2017 -0800

--
 .../server/api/services/AmbariMetaInfo.java | 12 
 .../server/api/services/AmbariMetaInfoTest.java | 32 ++--
 .../RepositoryVersionResourceProviderTest.java  |  5 +--
 3 files changed, 37 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e404100b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index b1eba8f..9fee0ae 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -139,7 +139,7 @@ public class AmbariMetaInfo {
   private File commonWidgetsDescriptorFile;
   private File customActionRoot;
   private String commonKerberosDescriptorFileLocation;
-  private Map versionDefinitions = null;
+  Map versionDefinitions = null;
 
 
   @Inject
@@ -1368,12 +1368,12 @@ public class AmbariMetaInfo {
 versionDefinitions = new HashMap<>();
 
 for (StackInfo stack : getStacks()) {
-  for (VersionDefinitionXml definition : stack.getVersionDefinitions()) {
-versionDefinitions.put(String.format("%s-%s-%s", stack.getName(),
-stack.getVersion(), definition.release.version), definition);
-  }
-
   if (stack.isActive() && stack.isValid()) {
+for (VersionDefinitionXml definition : stack.getVersionDefinitions()) {
+  versionDefinitions.put(String.format("%s-%s-%s", stack.getName(),
+stack.getVersion(), definition.release.version), definition);
+}
+
 try {
   // !!! check for a "latest-vdf" one.  This will be used for the 
default if one is not found.
   VersionDefinitionXml xml = stack.getLatestVersionDefinition();

http://git-wip-us.apache.org/repos/asf/ambari/blob/e404100b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
index 9285526..f98cffd 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
@@ -133,8 +133,7 @@ public class AmbariMetaInfoTest {
   private static final int OS_CNT = 4;
 
   private static TestAmbariMetaInfo metaInfo = null;
-  private final static Logger LOG =
-  LoggerFactory.getLogger(AmbariMetaInfoTest.class);
+  private final static Logger LOG = 
LoggerFactory.getLogger(AmbariMetaInfoTest.class);
   private static final String FILE_NAME = "hbase-site.xml";
   private static final String HADOOP_ENV_FILE_NAME = "hadoop-env.xml";
   private static final String HDFS_LOG4J_FILE_NAME = "hdfs-log4j.xml";
@@ -1902,6 +1901,35 @@ public class AmbariMetaInfoTest {
 Assert.assertEquals("src/test/resources/widgets.json", 
widgetsFile.getPath());
   }
 
+  @Test
+  public void testGetVersionDefinitionsForDisabledStack() throws 
AmbariException {
+Map versionDefinitions = 
metaInfo.getVersionDefinitions();
+Assert.assertNotNull(versionDefinitions);
+// Check presence
+Map.Entry vdfEntry = null;
+for (Map.Entry entry : 
versionDefinitions.entrySet()) {
+  if (entry.getKey().equals("HDP-2.2.1")) {
+vdfEntry = entry;
+  }
+}
+Assert.assertNotNull("Candidate stack and vdf for test case.", vdfEntry);
+StackInfo stackInfo = metaInfo.getStack("HDP", "2.2.1");
+// Strange that this is not immutable but works for this test !
+stackInfo.setActive(false);
+
+// Hate to use reflection 

ambari git commit: AMBARI-22686. Disabled stack still appears in the UI if VDF is available. (swagle)

[swagle]

Repository: ambari
Updated Branches:
  refs/heads/trunk 36d0271f7 -> e404100b9


AMBARI-22686. Disabled stack still appears in the UI if VDF is available. 
(swagle)


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

Branch: refs/heads/trunk
Commit: e404100b99ffac8f14e36b46770466deeb5760d7
Parents: 36d0271
Author: Siddharth Wagle 
Authored: Thu Dec 21 13:30:14 2017 -0800
Committer: Siddharth Wagle 
Committed: Thu Dec 21 13:30:14 2017 -0800

--
 .../server/api/services/AmbariMetaInfo.java | 12 
 .../server/api/services/AmbariMetaInfoTest.java | 32 ++--
 .../RepositoryVersionResourceProviderTest.java  |  5 +--
 3 files changed, 37 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e404100b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index b1eba8f..9fee0ae 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -139,7 +139,7 @@ public class AmbariMetaInfo {
   private File commonWidgetsDescriptorFile;
   private File customActionRoot;
   private String commonKerberosDescriptorFileLocation;
-  private Map versionDefinitions = null;
+  Map versionDefinitions = null;
 
 
   @Inject
@@ -1368,12 +1368,12 @@ public class AmbariMetaInfo {
 versionDefinitions = new HashMap<>();
 
 for (StackInfo stack : getStacks()) {
-  for (VersionDefinitionXml definition : stack.getVersionDefinitions()) {
-versionDefinitions.put(String.format("%s-%s-%s", stack.getName(),
-stack.getVersion(), definition.release.version), definition);
-  }
-
   if (stack.isActive() && stack.isValid()) {
+for (VersionDefinitionXml definition : stack.getVersionDefinitions()) {
+  versionDefinitions.put(String.format("%s-%s-%s", stack.getName(),
+stack.getVersion(), definition.release.version), definition);
+}
+
 try {
   // !!! check for a "latest-vdf" one.  This will be used for the 
default if one is not found.
   VersionDefinitionXml xml = stack.getLatestVersionDefinition();

http://git-wip-us.apache.org/repos/asf/ambari/blob/e404100b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
index 9285526..f98cffd 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
@@ -133,8 +133,7 @@ public class AmbariMetaInfoTest {
   private static final int OS_CNT = 4;
 
   private static TestAmbariMetaInfo metaInfo = null;
-  private final static Logger LOG =
-  LoggerFactory.getLogger(AmbariMetaInfoTest.class);
+  private final static Logger LOG = 
LoggerFactory.getLogger(AmbariMetaInfoTest.class);
   private static final String FILE_NAME = "hbase-site.xml";
   private static final String HADOOP_ENV_FILE_NAME = "hadoop-env.xml";
   private static final String HDFS_LOG4J_FILE_NAME = "hdfs-log4j.xml";
@@ -1902,6 +1901,35 @@ public class AmbariMetaInfoTest {
 Assert.assertEquals("src/test/resources/widgets.json", 
widgetsFile.getPath());
   }
 
+  @Test
+  public void testGetVersionDefinitionsForDisabledStack() throws 
AmbariException {
+Map versionDefinitions = 
metaInfo.getVersionDefinitions();
+Assert.assertNotNull(versionDefinitions);
+// Check presence
+Map.Entry vdfEntry = null;
+for (Map.Entry entry : 
versionDefinitions.entrySet()) {
+  if (entry.getKey().equals("HDP-2.2.1")) {
+vdfEntry = entry;
+  }
+}
+Assert.assertNotNull("Candidate stack and vdf for test case.", vdfEntry);
+StackInfo stackInfo = metaInfo.getStack("HDP", "2.2.1");
+// Strange that this is not immutable but works for this test !
+

ambari git commit: AMBARI-22686. Disabled stack still appears in the UI if VDF is available. (swagle)

[swagle]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 0cf1defb1 -> e04470dc5


AMBARI-22686. Disabled stack still appears in the UI if VDF is available. 
(swagle)


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

Branch: refs/heads/branch-2.6
Commit: e04470dc54c30ab0a637f1bb243a95999cfb5b0a
Parents: 0cf1def
Author: Siddharth Wagle 
Authored: Thu Dec 21 13:17:14 2017 -0800
Committer: Siddharth Wagle 
Committed: Thu Dec 21 13:17:14 2017 -0800

--
 .../server/api/services/AmbariMetaInfo.java | 13 
 .../server/api/services/AmbariMetaInfoTest.java | 32 ++--
 .../RepositoryVersionResourceProviderTest.java  |  5 +--
 3 files changed, 38 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e04470dc/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 4ac8574..11346c4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -140,7 +140,8 @@ public class AmbariMetaInfo {
   private File extensionsRoot;
   private File serverVersionFile;
   private File customActionRoot;
-  private Map versionDefinitions = null;
+
+  Map versionDefinitions = null;
 
 
   @Inject
@@ -1428,12 +1429,12 @@ public class AmbariMetaInfo {
 versionDefinitions = new HashMap<>();
 
 for (StackInfo stack : getStacks()) {
-  for (VersionDefinitionXml definition : stack.getVersionDefinitions()) {
-versionDefinitions.put(String.format("%s-%s-%s", stack.getName(),
-stack.getVersion(), definition.release.version), definition);
-  }
-
   if (stack.isActive() && stack.isValid()) {
+for (VersionDefinitionXml definition : stack.getVersionDefinitions()) {
+  versionDefinitions.put(String.format("%s-%s-%s", stack.getName(),
+stack.getVersion(), definition.release.version), definition);
+}
+
 try {
   // !!! check for a "latest-vdf" one.  This will be used for the 
default if one is not found.
   VersionDefinitionXml xml = stack.getLatestVersionDefinition();

http://git-wip-us.apache.org/repos/asf/ambari/blob/e04470dc/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
index e9567f1..1fe4641 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
@@ -133,8 +133,7 @@ public class AmbariMetaInfoTest {
   private static final int OS_CNT = 4;
 
   private static TestAmbariMetaInfo metaInfo = null;
-  private final static Logger LOG =
-  LoggerFactory.getLogger(AmbariMetaInfoTest.class);
+  private final static Logger LOG = 
LoggerFactory.getLogger(AmbariMetaInfoTest.class);
   private static final String FILE_NAME = "hbase-site.xml";
   private static final String HADOOP_ENV_FILE_NAME = "hadoop-env.xml";
   private static final String HDFS_LOG4J_FILE_NAME = "hdfs-log4j.xml";
@@ -1906,6 +1905,35 @@ public class AmbariMetaInfoTest {
 
Assert.assertTrue(descriptor.getService("NEW_SERVICE").shouldPreconfigure());
   }
 
+  @Test
+  public void testGetVersionDefinitionsForDisabledStack() throws 
AmbariException {
+Map versionDefinitions = 
metaInfo.getVersionDefinitions();
+Assert.assertNotNull(versionDefinitions);
+// Check presence
+Map.Entry vdfEntry = null;
+for (Map.Entry entry : 
versionDefinitions.entrySet()) {
+  if (entry.getKey().equals("HDP-2.2.1")) {
+vdfEntry = entry;
+  }
+}
+Assert.assertNotNull("Candidate stack and vdf for test case.", vdfEntry);
+StackInfo stackInfo = metaInfo.getStack("HDP", "2.2.1");
+// Strange that this is not immutable but works for this test !
+stackInfo.setActive(false);
+
+