AMBARI-8325. Ambari SCOM doesn't compile in trunk (jluniya via dlysni…

…chenko)
kasakrisz · Nov 19, 2014 · 27821a2 · 27821a2
1 parent 959525e
commit 27821a2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/...rib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/AmbariServer.java b/...rib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/AmbariServer.java
@@ -311,11 +311,9 @@ private void addInMemoryUsers() {
       LOG.info("In-memory database is used - creating default users");
       Users users = injector.getInstance(Users.class);
 
-      users.createDefaultRoles();
-      users.createUser("admin", "admin");
-      users.createUser("user", "user");
       try {
-        users.promoteToAdmin(users.getLocalUser("admin"));
+        users.createUser("admin", "admin", true, true, false);
+        users.createUser("user", "user", true, false, false);
       } catch (AmbariException e) {
         throw new RuntimeException(e);
       }

diff --git a/...mbari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLProviderModule.java b/...mbari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLProviderModule.java
@@ -117,11 +117,11 @@ protected void createPropertyProviders(Resource.Type type) {
               SCOMMetricHelper.getJMXPropertyIds(type),
               urlStreamProvider,
               this,
+              this,
               PropertyHelper.getPropertyId("ServiceComponentInfo", "cluster_name"),
               null,
               PropertyHelper.getPropertyId("ServiceComponentInfo", "component_name"),
-              PropertyHelper.getPropertyId("ServiceComponentInfo", "state"),
-              Collections.singleton("STARTED")));
+              PropertyHelper.getPropertyId("ServiceComponentInfo", "state")));
 
       providers.add(new SQLPropertyProvider(
               SCOMMetricHelper.getSqlServerPropertyIds(type),
@@ -135,11 +135,11 @@ protected void createPropertyProviders(Resource.Type type) {
               SCOMMetricHelper.getJMXPropertyIds(type),
               urlStreamProvider,
               this,
+              this,
               PropertyHelper.getPropertyId("HostRoles", "cluster_name"),
               PropertyHelper.getPropertyId("HostRoles", "host_name"),
               PropertyHelper.getPropertyId("HostRoles", "component_name"),
-              PropertyHelper.getPropertyId("HostRoles", "state"),
-              Collections.singleton("STARTED")));
+              PropertyHelper.getPropertyId("HostRoles", "state")));
 
       providers.add(new SQLPropertyProvider(
               SCOMMetricHelper.getSqlServerPropertyIds(type),

diff --git a/...bari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ServiceProviderTest.java b/...bari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ServiceProviderTest.java
@@ -41,7 +41,7 @@ public void testGetResources() throws Exception {
     ClusterDefinition clusterDefinition = new ClusterDefinition(new TestStateProvider(), new TestClusterDefinitionProvider(), new TestHostInfoProvider());
     ServiceProvider provider = new ServiceProvider(clusterDefinition);
     Set<Resource> resources = provider.getResources(PropertyHelper.getReadRequest(), null);
-    Assert.assertEquals(8, resources.size());
+    Assert.assertEquals(7, resources.size());
   }
 
   @Test