ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmitriu...@apache.org
Subject [2/5] ambari git commit: AMBARI-22353. Remove properties.json And Switch To Adding Properties to ResourceProviders Dynamically (dlysnichenko)
Date Mon, 04 Dec 2017 16:21:49 GMT
http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/main/resources/properties.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/properties.json b/ambari-server/src/main/resources/properties.json
deleted file mode 100644
index 1d12f83..0000000
--- a/ambari-server/src/main/resources/properties.json
+++ /dev/null
@@ -1,487 +0,0 @@
-{
-    "Cluster":[
-        "Clusters/cluster_id",
-        "Clusters/cluster_name",
-        "Clusters/provisioning_state",
-        "Clusters/security_type",
-        "Clusters/version",
-        "Clusters/state",
-        "Clusters/desired_configs",
-        "Clusters/desired_service_config_versions",
-        "Clusters/total_hosts",
-        "Clusters/health_report",
-        "_"
-    ],
-    "Host":[
-        "Hosts/cluster_name",
-        "Hosts/host_name",
-        "Hosts/ip",
-        "Hosts/attributes",
-        "Hosts/total_mem",
-        "Hosts/cpu_count",
-        "Hosts/ph_cpu_count",
-        "Hosts/os_arch",
-        "Hosts/os_type",
-        "Hosts/os_family",
-        "Hosts/rack_info",
-        "Hosts/last_heartbeat_time",
-        "Hosts/last_agent_env",
-        "Hosts/last_registration_time",
-        "Hosts/disk_info",
-        "Hosts/host_status",
-        "Hosts/host_health_report",
-        "Hosts/public_host_name",
-        "Hosts/host_state",
-        "Hosts/maintenance_state",
-        "Hosts/desired_configs",
-        "Hosts/recovery_report",
-        "Hosts/recovery_summary",
-        "_"
-    ],
-    "HostComponent":[
-        "HostRoles/role_id",
-        "HostRoles/cluster_name",
-        "HostRoles/host_name",
-        "HostRoles/public_host_name",
-        "HostRoles/component_name",
-        "HostRoles/display_name",
-        "HostRoles/state",
-        "HostRoles/desired_state",
-        "HostRoles/version",
-        "HostRoles/desired_stack_id",
-        "HostRoles/desired_repository_version",
-        "HostRoles/actual_configs",
-        "params/run_smoke_test",
-        "HostRoles/stale_configs",
-        "HostRoles/reload_configs",
-        "HostRoles/desired_admin_state",
-        "HostRoles/maintenance_state",
-        "HostRoles/service_name",
-        "HostRoles/upgrade_state",
-        "_"
-    ],
-    "ConfigGroup": [
-        "ConfigGroup/id",
-        "ConfigGroup/cluster_name",
-        "ConfigGroup/group_name",
-        "ConfigGroup/service_name",
-        "ConfigGroup/tag",
-        "ConfigGroup/description",
-        "ConfigGroup/hosts",
-        "ConfigGroup/desired_configs"
-    ],
-    "Action":[
-        "Actions/action_name",
-        "Actions/action_type",
-        "Actions/inputs",
-        "Actions/target_service",
-        "Actions/target_component",
-        "Actions/description",
-        "Actions/target_type",
-        "Actions/default_timeout",
-        "_"
-    ],
-    "Request":[
-        "Requests/id",
-        "Requests/cluster_name",
-        "Requests/request_status",
-        "Requests/request_context",
-        "Requests/request_schedule",
-        "Requests/type",
-        "Requests/inputs",
-        "Requests/resource_filters",
-        "Requests/operation_level",
-        "Requests/create_time",
-        "Requests/start_time",
-        "Requests/end_time",
-        "Requests/exclusive",
-        "Requests/task_count",
-        "Requests/failed_task_count",
-        "Requests/aborted_task_count",
-        "Requests/timed_out_task_count",
-        "Requests/completed_task_count",
-        "Requests/queued_task_count",
-        "Requests/progress_percent",
-        "Requests/abort_reason",
-        "Requests/remove_pending_host_requests",
-        "Requests/pending_host_request_count",
-        "Requests/cluster_host_info",
-        "_"
-    ],
-    "RequestSchedule" : [
-        "RequestSchedule/id",
-        "RequestSchedule/cluster_name",
-        "RequestSchedule/description",
-        "RequestSchedule/status",
-        "RequestSchedule/last_execution_status",
-        "RequestSchedule/batch",
-        "RequestSchedule/schedule",
-        "_"
-    ],
-    "Task":[
-        "Tasks/id",
-        "Tasks/request_id",
-        "Tasks/cluster_name",
-        "Tasks/stage_id",
-        "Tasks/host_name",
-        "Tasks/role",
-        "Tasks/command",
-        "Tasks/status",
-        "Tasks/exit_code",
-        "Tasks/stderr",
-        "Tasks/stdout",
-        "Tasks/output_log",
-        "Tasks/error_log",
-        "Tasks/start_time",
-        "Tasks/end_time",
-        "Tasks/structured_out",
-        "Tasks/attempt_cnt",
-        "Tasks/custom_command_name",
-        "Tasks/command_detail",
-        "Tasks/ops_display_name",
-        "_"
-    ],
-    "User":[
-        "Users/user_name",
-        "Users/password",
-        "Users/old_password",
-        "Users/ldap_user",
-        "Users/user_type",
-        "Users/active",
-        "Users/groups",
-        "Users/admin",
-        "_"
-    ],
-    "Group":[
-        "Groups/group_name",
-        "Groups/ldap_group",
-        "Groups/group_type",
-        "_"
-    ],
-    "Member":[
-        "MemberInfo/group_name",
-        "MemberInfo/user_name",
-        "_"
-    ],
-    "Stack":[
-        "Stacks/stack_name",
-        "_"
-    ],
-    "StackVersion":[
-        "Versions/stack_name",
-        "Versions/stack_version",
-        "Versions/min_upgrade_version",
-        "Versions/active",
-        "Versions/valid",
-        "Versions/stack-errors",
-        "Versions/parent_stack_version",
-        "Versions/config_types",
-        "Versions/upgrade_packs",
-        "_"
-    ],
-    "StackService":[
-        "StackServices/stack_name",
-        "StackServices/stack_version",
-        "StackServices/service_name",
-        "StackServices/display_name",
-        "StackServices/selection",
-        "StackServices/user_name",
-        "StackServices/comments",
-        "StackServices/service_version",
-        "StackServices/config_types",
-        "StackServices/service_check_supported",
-        "StackServices/custom_commands",
-        "StackServices/required_services",
-        "StackServices/credential_store_supported",
-        "StackServices/credential_store_enabled",
-        "StackServices/credential_store_required",
-        "StackServices/properties",
-        "StackServices/support_delete_via_ui",
-        "_"
-    ],
-    "StackConfiguration":[
-        "StackConfigurations/stack_name",
-        "StackConfigurations/stack_version",
-        "StackConfigurations/service_name",
-        "StackConfigurations/property_name",
-        "StackConfigurations/property_value",
-        "StackConfigurations/property_value_attributes",
-        "StackConfigurations/property_depends_on",
-        "StackConfigurations/property_description",
-        "StackConfigurations/property_display_name",
-        "StackConfigurations/type",
-        "StackConfigurations/final",
-        "StackConfigurations/adding_forbidden",
-        "StackConfigurations/do_not_extend",
-        "StackConfigurations/property_type",
-        "_"
-    ],
-    "StackServiceComponent":[
-        "StackServiceComponents/stack_name",
-        "StackServiceComponents/stack_version",
-        "StackServiceComponents/service_name",
-        "StackServiceComponents/component_name",
-        "StackServiceComponents/display_name",
-        "StackServiceComponents/component_category",
-        "StackServiceComponents/is_client",
-        "StackServiceComponents/is_master",
-        "StackServiceComponents/cardinality",
-        "StackServiceComponents/custom_commands",
-        "StackServiceComponents/recovery_enabled",
-        "StackServiceComponents/advertise_version",
-        "StackServiceComponents/decommission_allowed",
-        "StackServiceComponents/reassign_allowed",
-        "StackServiceComponents/has_bulk_commands_definition",
-        "StackServiceComponents/bulk_commands_display_name",
-        "StackServiceComponents/bulk_commands_master_component_name",
-        "StackServiceComponents/rolling_restart_supported",
-        "auto_deploy/enabled",
-        "auto_deploy/location",
-        "_"
-    ],
-    "StackServiceComponentDependency" :[
-        "Dependencies/stack_name",
-        "Dependencies/stack_version",
-        "Dependencies/dependent_service_name",
-        "Dependencies/dependent_component_name",
-        "Dependencies/service_name",
-        "Dependencies/component_name",
-        "Dependencies/scope",
-        "Dependencies/conditions",
-        "auto_deploy/enabled",
-        "auto_deploy/location"
-    ],
-    "ExtensionLink": [
-        "ExtensionLink/link_id",
-        "ExtensionLink/stack_name",
-        "ExtensionLink/stack_version",
-        "ExtensionLink/extension_name",
-        "ExtensionLink/extension_version",
-        "_"
-    ],
-    "Extension":[
-        "Extensions/extension_name",
-        "_"
-    ],
-    "ExtensionVersion":[
-        "Versions/extension_name",
-        "Versions/extension_version",
-        "Versions/valid",
-        "Versions/extension-errors",
-        "Versions/parent_extension_version",
-        "_"
-    ],
-    "DRFeed":[
-        "Feed/name",
-        "Feed/description",
-        "Feed/status",
-        "Feed/frequency",
-        "Feed/sourceCluster",
-        "Feed/targetCluster",
-        "Feed/properties"
-    ],
-    "DRTargetCluster":[
-        "Cluster/name",
-        "Cluster/colo",
-        "Cluster/interfaces",
-        "Cluster/locations",
-        "Cluster/properties"
-    ],
-    "DRInstance":[
-        "Instance/feedName",
-        "Instance/id",
-        "Instance/status",
-        "Instance/startTime",
-        "Instance/endTime",
-        "Instance/details",
-        "Instance/log"
-    ],
-    "Workflow":[
-        "Workflow/cluster_name",
-        "Workflow/workflow_id",
-        "Workflow/name",
-        "Workflow/user_name",
-        "Workflow/start_time",
-        "Workflow/last_update_time",
-        "Workflow/elapsed_time",
-        "Workflow/input_bytes",
-        "Workflow/output_bytes",
-        "Workflow/num_jobs_total",
-        "Workflow/num_jobs_completed",
-        "Workflow/parent_id",
-        "Workflow/context"
-    ],
-    "Job":[
-        "Job/cluster_name",
-        "Job/workflow_id",
-        "Job/job_id",
-        "Job/name",
-        "Job/status",
-        "Job/user_name",
-        "Job/submit_time",
-        "Job/elapsed_time",
-        "Job/maps",
-        "Job/reduces",
-        "Job/input_bytes",
-        "Job/output_bytes",
-        "Job/conf_path",
-        "Job/workflow_entity_name"
-    ],
-    "TaskAttempt":[
-        "TaskAttempt/cluster_name",
-        "TaskAttempt/workflow_id",
-        "TaskAttempt/job_id",
-        "TaskAttempt/task_attempt_id",
-        "TaskAttempt/type",
-        "TaskAttempt/start_time",
-        "TaskAttempt/finish_time",
-        "TaskAttempt/map_finish_time",
-        "TaskAttempt/shuffle_finish_time",
-        "TaskAttempt/sort_finish_fime",
-        "TaskAttempt/input_bytes",
-        "TaskAttempt/output_bytes",
-        "TaskAttempt/status",
-        "TaskAttempt/locality"
-    ],
-    "RootService":[
-        "RootService/service_name"
-    ],
-    "RootServiceComponent":[
-        "RootServiceComponents/service_name",
-        "RootServiceComponents/component_name",
-        "RootServiceComponents/properties",
-        "RootServiceComponents/component_version",
-        "RootServiceComponents/server_clock"
-    ],
-    "RootServiceHostComponent":[
-        "RootServiceHostComponents/service_name",
-        "RootServiceHostComponents/component_name",
-        "RootServiceHostComponents/host_name",
-        "RootServiceHostComponents/component_state",
-        "RootServiceHostComponents/component_version",
-        "RootServiceHostComponents/properties"
-     ],
-    "Blueprint":[
-        "Blueprints/blueprint_name",
-        "Blueprints/stack_name",
-        "Blueprints/stack_version",
-        "Blueprints/security",
-        "host_groups",
-        "host_groups/components",
-        "host_groups/cardinality",
-        "configurations",
-        "validate_topology",
-        "settings"
-    ],
-    "Recommendation":[
-        "Recommendation/id",
-        "Versions/stack_name",
-        "Versions/stack_version",
-        "recommend",
-        "hosts",
-        "services",
-        "changed_configurations",
-        "user_context",
-        "user_context/operation",
-        "user_context/operation_details",
-        "recommendations",
-        "recommendations/blueprint",
-        "recommendations/blueprint/configurations",
-        "recommendations/blueprint/host_groups",
-        "recommendations/blueprint/host_groups/name",
-        "recommendations/blueprint/host_groups/components",
-        "recommendations/blueprint_cluster_binding",
-        "recommendations/blueprint_cluster_binding/host_groups",
-        "recommendations/blueprint_cluster_binding/host_groups/name",
-        "recommendations/blueprint_cluster_binding/host_groups/hosts",
-        "recommendations/config_groups"
-    ],
-    "Validation":[
-        "Validation/id",
-        "Versions/stack_name",
-        "Versions/stack_version",
-        "items",
-        "items/type",
-        "items/level",
-        "items/message",
-        "items/component-name",
-        "items/host",
-        "items/config-type",
-        "items/config-name",
-        "items/host-group",
-        "validate",
-        "hosts",
-        "services",
-        "recommendations"
-    ],
-    "HostComponentProcess": [
-      "HostComponentProcess/cluster_name",
-      "HostComponentProcess/host_name",
-      "HostComponentProcess/component_name",
-      "HostComponentProcess/name",
-      "HostComponentProcess/status"
-    ],
-    "ClientConfig":[
-        "ServiceComponentInfo/service_name",
-        "ServiceComponentInfo/component_name",
-        "ServiceComponentInfo/cluster_name",
-        "HostRoles/host_name",
-        "_"
-    ],
-    "Widget":[
-      "WidgetInfo/id",
-      "WidgetInfo/cluster_name",
-      "WidgetInfo/widget_name",
-      "WidgetInfo/display_name",
-      "WidgetInfo/widget_type",
-      "WidgetInfo/time_created",
-      "WidgetInfo/author",
-      "WidgetInfo/description",
-      "WidgetInfo/scope",
-      "WidgetInfo/metrics",
-      "WidgetInfo/values",
-      "WidgetInfo/properties",
-      "_"
-    ],
-    "WidgetLayout":[
-      "WidgetLayoutInfo/id",
-      "WidgetLayoutInfo/section_name",
-      "WidgetLayoutInfo/cluster_name",
-      "WidgetLayoutInfo/layout_name",
-      "WidgetLayoutInfo/display_name",
-      "WidgetLayoutInfo/scope",
-      "WidgetLayoutInfo/user_name",
-      "WidgetLayoutInfo/WidgetsInfo",
-      "User/user_name",
-      "_"
-    ],
-    "StackLevelConfiguration":[
-        "StackLevelConfigurations/stack_name",
-        "StackLevelConfigurations/stack_version",
-        "StackLevelConfigurations/property_name",
-        "StackLevelConfigurations/property_value",
-        "StackLevelConfigurations/property_display_name",
-        "StackLevelConfigurations/property_value_attributes",
-        "StackLevelConfigurations/property_depends_on",
-        "StackLevelConfigurations/property_description",
-        "StackLevelConfigurations/type",
-        "StackLevelConfigurations/final",
-        "StackLevelConfigurations/property_type",
-        "_"
-    ],
-    "StackConfigurationDependency":[
-        "StackConfigurationDependency/stack_name",
-        "StackConfigurationDependency/stack_version",
-        "StackConfigurationDependency/service_name",
-        "StackConfigurationDependency/property_name",
-        "StackConfigurationDependency/dependency_type",
-        "StackConfigurationDependency/dependency_name",
-        "_"
-    ],
-    "KerberosDescriptor":[
-        "KerberosDescriptors/kerberos_descriptor_name",
-        "KerberosDescriptors/kerberos_descriptor_text",
-        "_"
-    ]
-
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/MinimalRendererTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/MinimalRendererTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/MinimalRendererTest.java
index 782f148..6f75bab 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/MinimalRendererTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/MinimalRendererTest.java
@@ -40,10 +40,13 @@ import org.apache.ambari.server.api.services.Result;
 import org.apache.ambari.server.api.services.ResultImpl;
 import org.apache.ambari.server.api.util.TreeNode;
 import org.apache.ambari.server.api.util.TreeNodeImpl;
+import org.apache.ambari.server.controller.internal.HostComponentResourceProvider;
+import org.apache.ambari.server.controller.internal.HostResourceProvider;
 import org.apache.ambari.server.controller.internal.ResourceImpl;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.Schema;
 import org.apache.ambari.server.controller.spi.SchemaFactory;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.junit.Test;
 
 /**
@@ -496,6 +499,9 @@ public class MinimalRendererTest {
 
     // host 1 : ambari host
     Resource hostResource = new ResourceImpl(Resource.Type.Host);
+
+    PropertyHelper.setKeyPropertyIds(Resource.Type.Host,HostResourceProvider.keyPropertyIds);
+    PropertyHelper.setKeyPropertyIds(Resource.Type.HostComponent, HostComponentResourceProvider.keyPropertyIds);
     hostResource.setProperty("Hosts/host_name", "testHost");
     hostResource.setProperty("Hosts/cluster_name", "testCluster");
     hostResource.setProperty("foo", "bar");

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProviderTest.java
index a127de6..7f47ab2 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProviderTest.java
@@ -61,8 +61,6 @@ public class AbstractControllerResourceProviderTest {
     AbstractResourceProvider provider =
         (AbstractResourceProvider) AbstractControllerResourceProvider.getResourceProvider(
             Resource.Type.Service,
-            null,
-            null,
             managementController);
 
     Assert.assertTrue(provider instanceof ServiceResourceProvider);
@@ -73,7 +71,7 @@ public class AbstractControllerResourceProviderTest {
     AmbariManagementController managementController = createMock(AmbariManagementController.class);
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
-        Resource.Type.StackArtifact, null, null, managementController);
+        Resource.Type.StackArtifact, managementController);
 
     assertEquals(StackArtifactResourceProvider.class, provider.getClass());
   }
@@ -85,7 +83,7 @@ public class AbstractControllerResourceProviderTest {
     replay(managementController);
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
-        Resource.Type.RoleAuthorization, null, null, managementController);
+        Resource.Type.RoleAuthorization, managementController);
 
     verify(managementController);
 
@@ -99,7 +97,7 @@ public class AbstractControllerResourceProviderTest {
     replay(managementController);
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
-        Resource.Type.UserAuthorization, null, null, managementController);
+        Resource.Type.UserAuthorization, managementController);
 
     verify(managementController);
 
@@ -113,7 +111,7 @@ public class AbstractControllerResourceProviderTest {
     replay(managementController);
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
-        Resource.Type.ClusterKerberosDescriptor, null, null, managementController);
+        Resource.Type.ClusterKerberosDescriptor, managementController);
 
     verify(managementController);
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractDRResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractDRResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractDRResourceProviderTest.java
index 38e6d36..2aa6efa 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractDRResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractDRResourceProviderTest.java
@@ -53,8 +53,6 @@ public class AbstractDRResourceProviderTest {
     AbstractResourceProvider provider =
         (AbstractResourceProvider) AbstractDRResourceProvider.getResourceProvider(
             Resource.Type.DRFeed,
-            propertyIds,
-            keyPropertyIds,
             ivoryService);
 
     Assert.assertTrue(provider instanceof FeedResourceProvider);

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java
index 7165e48..0ed8fba 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java
@@ -80,45 +80,41 @@ public class AbstractResourceProviderTest {
 
     AmbariManagementController managementController = createMock(AmbariManagementController.class);
 
-    AbstractResourceProvider provider = new HostComponentProcessResourceProvider(propertyIds,
-        keyPropertyIds, managementController);
+    AbstractResourceProvider provider = new HostComponentProcessResourceProvider(managementController);
 
-    Set<String> unsupported = provider.checkPropertyIds(Collections.singleton("foo"));
+    Set<String> unsupported = provider.checkPropertyIds(Collections.singleton("HostComponentProcess/host_name"));
     Assert.assertTrue(unsupported.isEmpty());
 
     // note that key is not in the set of known property ids.  We allow it if its parent is a known property.
     // this allows for Map type properties where we want to treat the entries as individual properties
-    Assert.assertTrue(provider.checkPropertyIds(Collections.singleton("cat5/subcat5/map/key")).isEmpty());
+    Assert.assertTrue(provider.checkPropertyIds(Collections.singleton("HostComponentProcess/host_name/foo")).isEmpty());
 
     unsupported = provider.checkPropertyIds(Collections.singleton("bar"));
     Assert.assertEquals(1, unsupported.size());
     Assert.assertTrue(unsupported.contains("bar"));
 
-    unsupported = provider.checkPropertyIds(Collections.singleton("cat1/foo"));
+    unsupported = provider.checkPropertyIds(Collections.singleton("HostComponentProcess/status"));
     Assert.assertTrue(unsupported.isEmpty());
 
-    unsupported = provider.checkPropertyIds(Collections.singleton("cat1"));
+    unsupported = provider.checkPropertyIds(Collections.singleton("HostComponentProcess"));
     Assert.assertTrue(unsupported.isEmpty());
   }
 
   @Test
   public void testGetPropertyIds() {
     Set<String> propertyIds = new HashSet<>();
-    propertyIds.add("p1");
-    propertyIds.add("foo");
-    propertyIds.add("cat1/foo");
-    propertyIds.add("cat2/bar");
-    propertyIds.add("cat2/baz");
-    propertyIds.add("cat3/sub1/bam");
-    propertyIds.add("cat4/sub2/sub3/bat");
+    propertyIds.add("HostComponentProcess/name");
+    propertyIds.add("HostComponentProcess/status");
+    propertyIds.add("HostComponentProcess/cluster_name");
+    propertyIds.add("HostComponentProcess/host_name");
+    propertyIds.add("HostComponentProcess/component_name");
 
     AmbariManagementController managementController = createMock(AmbariManagementController.class);
     MaintenanceStateHelper maintenanceStateHelper = createNiceMock(MaintenanceStateHelper.class);
     RepositoryVersionDAO repositoryVersionDAO = createNiceMock(RepositoryVersionDAO.class);
     replay(maintenanceStateHelper, repositoryVersionDAO);
 
-    AbstractResourceProvider provider = new HostComponentProcessResourceProvider(propertyIds,
-        keyPropertyIds, managementController);
+    AbstractResourceProvider provider = new HostComponentProcessResourceProvider(managementController);
 
     Set<String> supportedPropertyIds = provider.getPropertyIds();
     Assert.assertTrue(supportedPropertyIds.containsAll(propertyIds));

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActionResourceProviderTest.java
index ef56f9d..e53c534 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActionResourceProviderTest.java
@@ -65,8 +65,6 @@ public class ActionResourceProviderTest {
 
     return (ActionResourceProvider) AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
   }
 
@@ -126,8 +124,6 @@ public class ActionResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     Set<String> propertyIds = new HashSet<>();

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProviderTest.java
index 5221ecf..bfeecfe 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProviderTest.java
@@ -338,8 +338,6 @@ public class ActiveWidgetLayoutResourceProviderTest extends EasyMockSupport {
 
     return AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.ActiveWidgetLayout,
-        PropertyHelper.getPropertyIds(Resource.Type.ActiveWidgetLayout),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.ActiveWidgetLayout),
         managementController);
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
index f534411..c7b8d71 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
@@ -61,7 +61,6 @@ import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
 import org.apache.ambari.server.controller.spi.ResourceProvider;
 import org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
-import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.orm.dao.BlueprintDAO;
 import org.apache.ambari.server.orm.dao.StackDAO;
 import org.apache.ambari.server.orm.entities.BlueprintConfigEntity;
@@ -165,8 +164,6 @@ public class BlueprintResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Blueprint,
-        PropertyHelper.getPropertyIds(Resource.Type.Blueprint),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Blueprint),
         managementController);
 
     AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
@@ -202,8 +199,6 @@ public class BlueprintResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
       Resource.Type.Blueprint,
-      PropertyHelper.getPropertyIds(Resource.Type.Blueprint),
-      PropertyHelper.getKeyPropertyIds(Resource.Type.Blueprint),
       managementController);
 
     try {
@@ -245,8 +240,6 @@ public class BlueprintResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Blueprint,
-        PropertyHelper.getPropertyIds(Resource.Type.Blueprint),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Blueprint),
         managementController);
 
     AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
@@ -287,8 +280,6 @@ public class BlueprintResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Blueprint,
-        PropertyHelper.getPropertyIds(Resource.Type.Blueprint),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Blueprint),
         createMock(AmbariManagementController.class));
 
     AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
@@ -334,8 +325,6 @@ public class BlueprintResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Blueprint,
-        PropertyHelper.getPropertyIds(Resource.Type.Blueprint),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Blueprint),
         managementController);
 
     AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
@@ -413,8 +402,6 @@ public class BlueprintResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
       Resource.Type.Blueprint,
-      PropertyHelper.getPropertyIds(Resource.Type.Blueprint),
-      PropertyHelper.getKeyPropertyIds(Resource.Type.Blueprint),
       managementController);
 
     AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
@@ -541,8 +528,6 @@ public class BlueprintResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Blueprint,
-        PropertyHelper.getPropertyIds(Resource.Type.Blueprint),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Blueprint),
         managementController);
 
     AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
@@ -590,8 +575,6 @@ public class BlueprintResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Blueprint,
-        PropertyHelper.getPropertyIds(Resource.Type.Blueprint),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Blueprint),
         managementController);
 
     AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
@@ -828,9 +811,7 @@ public class BlueprintResourceProviderTest {
   }
 
   private static BlueprintResourceProvider createProvider() {
-    return new BlueprintResourceProvider(
-        PropertyHelper.getPropertyIds(Resource.Type.Blueprint),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Blueprint), null);
+    return new BlueprintResourceProvider(null);
   }
 
   private BlueprintEntity createEntity(Map<String, Object> properties) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/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 6779e26f..c5994c5 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
@@ -102,8 +102,6 @@ public class ClientConfigResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     // add the property map to a set for the request.  add more maps for multiple creates
@@ -144,8 +142,6 @@ public class ClientConfigResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     // add the property map to a set for the request.
@@ -214,8 +210,6 @@ public class ClientConfigResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     String clusterName = "C1";
@@ -461,8 +455,6 @@ public class ClientConfigResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     // create the request
@@ -645,8 +637,6 @@ public class ClientConfigResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     Predicate predicate = new PredicateBuilder().property(

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
index 7cbb4b7..686b5cd 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
@@ -935,7 +935,7 @@ public class ClusterControllerImplTest {
     public TestProviderModule() {
 
       for (Resource.Type type : Resource.Type.values()) {
-        providers.put(type, new TestResourceProvider(type));
+        providers.put(type, new TestResourceProvider());
       }
       providers.put(Resource.Type.Cluster, new TestClusterResourceProvider());
       providers.put(Resource.Type.Host, new TestHostResourceProvider());
@@ -965,8 +965,8 @@ public class ClusterControllerImplTest {
 
   private static class TestResourceProvider extends AbstractResourceProvider {
 
-    private TestResourceProvider(Resource.Type type) {
-      super(PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type));
+    private TestResourceProvider() {
+      super(new HashSet<>(), new HashMap<>());
     }
 
     private TestResourceProvider(Set<String> propertyIds, Map<Resource.Type, String> keyPropertyIds) {
@@ -1029,7 +1029,7 @@ public class ClusterControllerImplTest {
 
   private static class TestClusterResourceProvider extends TestResourceProvider {
     private TestClusterResourceProvider() {
-      super(Resource.Type.Cluster);
+      super(ClusterResourceProvider.propertyIds, ClusterResourceProvider.keyPropertyIds);
     }
 
     @Override
@@ -1048,7 +1048,7 @@ public class ClusterControllerImplTest {
     private Predicate lastPredicate = null;
 
     private TestHostResourceProvider() {
-      super(Resource.Type.Host);
+      super(HostResourceProvider.propertyIds, HostResourceProvider.keyPropertyIds);
     }
 
     @Override
@@ -1143,7 +1143,7 @@ public class ClusterControllerImplTest {
 
   private static class TestStackResourceProvider extends TestResourceProvider {
     private TestStackResourceProvider() {
-      super(Resource.Type.Stack);
+      super(StackResourceProvider.propertyIds, StackResourceProvider.keyPropertyIds);
     }
 
     @Override
@@ -1159,7 +1159,7 @@ public class ClusterControllerImplTest {
 
   private static class TestStackVersionResourceProvider extends TestResourceProvider {
     private TestStackVersionResourceProvider() {
-      super(Resource.Type.StackVersion);
+      super(StackVersionResourceProvider.propertyIds, StackVersionResourceProvider.keyPropertyIds);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterKerberosDescriptorResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterKerberosDescriptorResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterKerberosDescriptorResourceProviderTest.java
index ac28475..e867af3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterKerberosDescriptorResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterKerberosDescriptorResourceProviderTest.java
@@ -46,7 +46,6 @@ import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.ResourceProvider;
 import org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.controller.utilities.PredicateBuilder;
-import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.security.SecurePasswordHelper;
 import org.apache.ambari.server.security.TestAuthenticationFactory;
 import org.apache.ambari.server.security.encryption.CredentialStoreService;
@@ -237,8 +236,6 @@ public class ClusterKerberosDescriptorResourceProviderTest extends EasyMockSuppo
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.ClusterKerberosDescriptor,
-        PropertyHelper.getPropertyIds(Resource.Type.ClusterKerberosDescriptor),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.ClusterKerberosDescriptor),
         managementController);
 
     AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
@@ -299,8 +296,6 @@ public class ClusterKerberosDescriptorResourceProviderTest extends EasyMockSuppo
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.ClusterKerberosDescriptor,
-        PropertyHelper.getPropertyIds(Resource.Type.ClusterKerberosDescriptor),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.ClusterKerberosDescriptor),
         managementController);
 
     Predicate predicate = new PredicateBuilder()
@@ -379,8 +374,6 @@ public class ClusterKerberosDescriptorResourceProviderTest extends EasyMockSuppo
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.ClusterKerberosDescriptor,
-        PropertyHelper.getPropertyIds(Resource.Type.ClusterKerberosDescriptor),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.ClusterKerberosDescriptor),
         managementController);
 
     Predicate clusterPredicate = new PredicateBuilder()
@@ -497,8 +490,6 @@ public class ClusterKerberosDescriptorResourceProviderTest extends EasyMockSuppo
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.ClusterKerberosDescriptor,
-        PropertyHelper.getPropertyIds(Resource.Type.ClusterKerberosDescriptor),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.ClusterKerberosDescriptor),
         managementController);
 
     Predicate clusterPredicate = new PredicateBuilder()
@@ -620,8 +611,6 @@ public class ClusterKerberosDescriptorResourceProviderTest extends EasyMockSuppo
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.ClusterKerberosDescriptor,
-        PropertyHelper.getPropertyIds(Resource.Type.ClusterKerberosDescriptor),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.ClusterKerberosDescriptor),
         managementController);
 
     Predicate predicate1 = new PredicateBuilder()
@@ -688,8 +677,6 @@ public class ClusterKerberosDescriptorResourceProviderTest extends EasyMockSuppo
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.ClusterKerberosDescriptor,
-        PropertyHelper.getPropertyIds(Resource.Type.ClusterKerberosDescriptor),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.ClusterKerberosDescriptor),
         managementController);
 
 
@@ -729,8 +716,6 @@ public class ClusterKerberosDescriptorResourceProviderTest extends EasyMockSuppo
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.ClusterKerberosDescriptor,
-        PropertyHelper.getPropertyIds(Resource.Type.ClusterKerberosDescriptor),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.ClusterKerberosDescriptor),
         managementController);
 
     provider.createResources(request);
@@ -767,8 +752,6 @@ public class ClusterKerberosDescriptorResourceProviderTest extends EasyMockSuppo
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.ClusterKerberosDescriptor,
-        PropertyHelper.getPropertyIds(Resource.Type.ClusterKerberosDescriptor),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.ClusterKerberosDescriptor),
         managementController);
 
     Predicate predicate1 = new PredicateBuilder()

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
index 4a80893..e687983 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
@@ -275,8 +275,6 @@ public class ClusterResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
@@ -361,8 +359,6 @@ public class ClusterResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     Set<String> propertyIds = new HashSet<>();
@@ -536,8 +532,6 @@ public class ClusterResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
@@ -620,8 +614,6 @@ public class ClusterResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
@@ -710,8 +702,6 @@ public class ClusterResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Cluster,
-        PropertyHelper.getPropertyIds(Resource.Type.Cluster),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Cluster),
         managementController);
 
     AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
@@ -753,8 +743,6 @@ public class ClusterResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
@@ -801,8 +789,6 @@ public class ClusterResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     // add the property map to a set for the request.  add more maps for multiple creates

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
index a6fc919..51035ba 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
@@ -484,7 +484,7 @@ public class ClusterStackVersionResourceProviderTest {
             EasyMock.anyObject(), anyObject(String.class))).
             andReturn(packages).times(1); // only one host has the versionable component
 
-    expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostResourceProvider(
             eq(managementController))).andReturn(csvResourceProvider).anyTimes();
 
     expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster);
@@ -555,8 +555,6 @@ public class ClusterStackVersionResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     injector.injectMembers(provider);
@@ -704,7 +702,7 @@ public class ClusterStackVersionResourceProviderTest {
             EasyMock.anyObject(), anyObject(String.class))).
             andReturn(packages).anyTimes(); // only one host has the versionable component
 
-    expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostResourceProvider(
             eq(managementController))).andReturn(csvResourceProvider).anyTimes();
 
     expect(managementController.findConfigurationTagsWithOverrides(anyObject(Cluster.class), EasyMock.anyString()))
@@ -1362,8 +1360,7 @@ public class ClusterStackVersionResourceProviderTest {
         EasyMock.anyObject(), anyObject(String.class))).andReturn(
             packages).anyTimes(); // only one host has the versionable component
 
-    expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(),
-        EasyMock.anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes();
+    expect(resourceProviderFactory.getHostResourceProvider(eq(managementController))).andReturn(csvResourceProvider).anyTimes();
 
     expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster);
     expect(clusters.getHostsForCluster(anyObject(String.class))).andReturn(
@@ -1535,7 +1532,7 @@ public class ClusterStackVersionResourceProviderTest {
       .andReturn(new HashMap<String, Map<String, String>>()).anyTimes();
 
 
-    expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class),
+    expect(resourceProviderFactory.getHostResourceProvider(
             eq(managementController))).andReturn(csvResourceProvider).anyTimes();
 
     expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster);
@@ -2173,7 +2170,6 @@ public class ClusterStackVersionResourceProviderTest {
 
      Resource.Type type = Type.ClusterStackVersion;
      return (ClusterStackVersionResourceProvider) AbstractControllerResourceProvider.getResourceProvider(type,
-         PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type),
          amc);
    }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
index 78f79ea..82cdc19 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
@@ -102,8 +102,6 @@ public class ConfigGroupResourceProviderTest {
 
     return (ConfigGroupResourceProvider) AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java
index 785ea23..17bc127 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java
@@ -188,8 +188,6 @@ public class ConfigurationResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     Set<String> propertyIds = new HashSet<>();
@@ -297,8 +295,6 @@ public class ConfigurationResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     // add the property map to a set for the request.
@@ -332,8 +328,6 @@ public class ConfigurationResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     Predicate predicate = new PredicateBuilder().property(

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CredentialResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CredentialResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CredentialResourceProviderTest.java
index 89ed022..08c9839 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CredentialResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CredentialResourceProviderTest.java
@@ -43,7 +43,6 @@ import org.apache.ambari.server.controller.spi.Request;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.ResourceProvider;
 import org.apache.ambari.server.controller.utilities.PredicateBuilder;
-import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.security.SecurePasswordHelper;
 import org.apache.ambari.server.security.TestAuthenticationFactory;
 import org.apache.ambari.server.security.authorization.AuthorizationException;
@@ -151,8 +150,6 @@ public class CredentialResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Credential,
-        PropertyHelper.getPropertyIds(Resource.Type.Credential),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Credential),
         managementController);
 
     AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
@@ -196,8 +193,6 @@ public class CredentialResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Credential,
-        PropertyHelper.getPropertyIds(Resource.Type.Credential),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Credential),
         managementController);
 
     try {
@@ -236,8 +231,6 @@ public class CredentialResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Credential,
-        PropertyHelper.getPropertyIds(Resource.Type.Credential),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Credential),
         managementController);
 
     try {
@@ -293,8 +286,6 @@ public class CredentialResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Credential,
-        PropertyHelper.getPropertyIds(Resource.Type.Credential),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Credential),
         managementController);
 
 
@@ -359,8 +350,6 @@ public class CredentialResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Credential,
-        PropertyHelper.getPropertyIds(Resource.Type.Credential),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Credential),
         managementController);
 
     provider.createResources(request);
@@ -435,8 +424,6 @@ public class CredentialResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Credential,
-        PropertyHelper.getPropertyIds(Resource.Type.Credential),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Credential),
         managementController);
 
     provider.createResources(request);
@@ -512,8 +499,6 @@ public class CredentialResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Credential,
-        PropertyHelper.getPropertyIds(Resource.Type.Credential),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Credential),
         managementController);
 
     provider.createResources(request);
@@ -576,8 +561,6 @@ public class CredentialResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Credential,
-        PropertyHelper.getPropertyIds(Resource.Type.Credential),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Credential),
         managementController);
 
 
@@ -634,8 +617,6 @@ public class CredentialResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Credential,
-        PropertyHelper.getPropertyIds(Resource.Type.Credential),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Credential),
         managementController);
 
     provider.createResources(request);
@@ -728,8 +709,6 @@ public class CredentialResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Credential,
-        PropertyHelper.getPropertyIds(Resource.Type.Credential),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Credential),
         managementController);
 
     provider.createResources(request);
@@ -797,8 +776,6 @@ public class CredentialResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Credential,
-        PropertyHelper.getPropertyIds(Resource.Type.Credential),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Credential),
         managementController);
 
     provider.createResources(request);

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExtensionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExtensionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExtensionResourceProviderTest.java
index 5b6e830..6a5e96b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExtensionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExtensionResourceProviderTest.java
@@ -58,8 +58,6 @@ public class ExtensionResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     Set<String> propertyIds = new HashSet<>();

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java
index 5cf9b05..09826f0 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java
@@ -71,9 +71,7 @@ public class FeedResourceProviderTest {
 
     Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap());
 
-    FeedResourceProvider provider = new FeedResourceProvider(service,
-        PropertyHelper.getPropertyIds(Resource.Type.DRFeed),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.DRFeed));
+    FeedResourceProvider provider = new FeedResourceProvider(service);
 
     provider.createResources(request);
 
@@ -114,9 +112,7 @@ public class FeedResourceProviderTest {
 
     Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap());
 
-    FeedResourceProvider provider = new FeedResourceProvider(service,
-        PropertyHelper.getPropertyIds(Resource.Type.DRFeed),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.DRFeed));
+    FeedResourceProvider provider = new FeedResourceProvider(service);
 
     Set<Resource> resources = provider.getResources(request, null);
 
@@ -162,9 +158,7 @@ public class FeedResourceProviderTest {
 
     Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap());
 
-    FeedResourceProvider provider = new FeedResourceProvider(service,
-        PropertyHelper.getPropertyIds(Resource.Type.DRFeed),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.DRFeed));
+    FeedResourceProvider provider = new FeedResourceProvider(service);
 
     provider.updateResources(request, null);
 
@@ -193,9 +187,7 @@ public class FeedResourceProviderTest {
     // replay
     replay(service);
 
-    FeedResourceProvider provider = new FeedResourceProvider(service,
-        PropertyHelper.getPropertyIds(Resource.Type.DRFeed),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.DRFeed));
+    FeedResourceProvider provider = new FeedResourceProvider(service);
 
     Predicate predicate = new PredicateBuilder().property(FeedResourceProvider.FEED_NAME_PROPERTY_ID).equals("Feed1").toPredicate();
 
@@ -204,17 +196,4 @@ public class FeedResourceProviderTest {
     // verify
     verify(service);
   }
-
-  @Test
-  public void testGetKeyPropertyIds() throws Exception {
-    IvoryService service = createMock(IvoryService.class);
-
-    Map<Resource.Type, String> keyPropertyIds = PropertyHelper.getKeyPropertyIds(Resource.Type.DRFeed);
-
-    FeedResourceProvider provider = new FeedResourceProvider(service,
-        PropertyHelper.getPropertyIds(Resource.Type.DRFeed),
-        keyPropertyIds);
-
-    Assert.assertEquals(keyPropertyIds, provider.getKeyPropertyIds());
-  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/GroupResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/GroupResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/GroupResourceProviderTest.java
index bbfa2d8..938564a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/GroupResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/GroupResourceProviderTest.java
@@ -83,8 +83,6 @@ public class GroupResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     // add the property map to a set for the request.  add more maps for multiple creates
@@ -135,8 +133,6 @@ public class GroupResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     Set<String> propertyIds = new HashSet<>();
@@ -186,8 +182,6 @@ public class GroupResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     Map<String, Object> properties = new LinkedHashMap<>();
@@ -227,8 +221,6 @@ public class GroupResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     Predicate predicate = new PredicateBuilder().property(GroupResourceProvider.GROUP_GROUPNAME_PROPERTY_ID).

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProviderTest.java
index 5a7460d..d012601 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProviderTest.java
@@ -161,8 +161,6 @@ public class HostComponentProcessResourceProviderTest {
     
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         amc);
     
     return provider;

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
index 7e32c15..650dc78 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
@@ -105,9 +105,7 @@ public class HostComponentResourceProviderTest {
     ResourceProviderFactory resourceProviderFactory = createNiceMock(ResourceProviderFactory.class);
     Injector injector = createNiceMock(Injector.class);
     HostComponentResourceProvider hostComponentResourceProvider =
-        new HostComponentResourceProvider(PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
-        managementController, injector);
+        new HostComponentResourceProvider(managementController, injector);
 
     AbstractControllerResourceProvider.init(resourceProviderFactory);
 
@@ -115,8 +113,7 @@ public class HostComponentResourceProviderTest {
         AbstractResourceProviderTest.Matcher.getHostComponentRequestSet(
             "Cluster100", "Service100", "Component100", "Host100", null, null));
 
-    expect(resourceProviderFactory.getHostComponentResourceProvider(EasyMock.anyObject(),
-        EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostComponentResourceProvider(
         eq(managementController))).
         andReturn(hostComponentResourceProvider).anyTimes();
 
@@ -128,8 +125,6 @@ public class HostComponentResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     // add the property map to a set for the request.  add more maps for multiple creates
@@ -218,8 +213,7 @@ public class HostComponentResourceProviderTest {
 
 
     // set expectations
-    expect(resourceProviderFactory.getHostComponentResourceProvider(EasyMock.anyObject(),
-        EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostComponentResourceProvider(
         eq(managementController))).
         andReturn(hostComponentResourceProvider).anyTimes();
 
@@ -291,8 +285,6 @@ public class HostComponentResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
 
@@ -393,8 +385,7 @@ public class HostComponentResourceProviderTest {
     provider.setFieldValue("maintenanceStateHelper", maintenanceStateHelper);
     provider.setFieldValue("hostVersionDAO", hostVersionDAO);
 
-    expect(resourceProviderFactory.getHostComponentResourceProvider(EasyMock.anyObject(),
-        EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostComponentResourceProvider(
         eq(managementController))).
         andReturn(provider).anyTimes();
 
@@ -451,9 +442,7 @@ public class HostComponentResourceProviderTest {
     Injector injector = createNiceMock(Injector.class);
 
     HostComponentResourceProvider provider =
-        new HostComponentResourceProvider(PropertyHelper.getPropertyIds(type),
-            PropertyHelper.getKeyPropertyIds(type),
-            managementController, injector);
+        new HostComponentResourceProvider(managementController, injector);
 
     // set expectations
     expect(managementController.deleteHostComponents(
@@ -488,40 +477,27 @@ public class HostComponentResourceProviderTest {
 
   @Test
   public void testCheckPropertyIds() throws Exception {
-    Set<String> propertyIds = new HashSet<>();
-    propertyIds.add("foo");
-    propertyIds.add("cat1/foo");
-    propertyIds.add("cat2/bar");
-    propertyIds.add("cat2/baz");
-    propertyIds.add("cat3/sub1/bam");
-    propertyIds.add("cat4/sub2/sub3/bat");
-    propertyIds.add("cat5/subcat5/map");
-
-    Map<Resource.Type, String> keyPropertyIds = new HashMap<>();
-
     AmbariManagementController managementController = createMock(AmbariManagementController.class);
     Injector injector = createNiceMock(Injector.class);
 
     HostComponentResourceProvider provider =
-        new HostComponentResourceProvider(propertyIds,
-        keyPropertyIds,
-        managementController, injector);
+        new HostComponentResourceProvider(managementController, injector);
 
-    Set<String> unsupported = provider.checkPropertyIds(Collections.singleton("foo"));
+    Set<String> unsupported = provider.checkPropertyIds(Collections.singleton(PropertyHelper.getPropertyId("HostRoles", "cluster_name")));
     Assert.assertTrue(unsupported.isEmpty());
 
     // note that key is not in the set of known property ids.  We allow it if its parent is a known property.
     // this allows for Map type properties where we want to treat the entries as individual properties
-    Assert.assertTrue(provider.checkPropertyIds(Collections.singleton("cat5/subcat5/map/key")).isEmpty());
+    Assert.assertTrue(provider.checkPropertyIds(Collections.singleton(PropertyHelper.getPropertyId("HostRoles/service_name", "key"))).isEmpty());
 
     unsupported = provider.checkPropertyIds(Collections.singleton("bar"));
     Assert.assertEquals(1, unsupported.size());
     Assert.assertTrue(unsupported.contains("bar"));
 
-    unsupported = provider.checkPropertyIds(Collections.singleton("cat1/foo"));
+    unsupported = provider.checkPropertyIds(Collections.singleton(PropertyHelper.getPropertyId("HostRoles", "component_name")));
     Assert.assertTrue(unsupported.isEmpty());
 
-    unsupported = provider.checkPropertyIds(Collections.singleton("cat1"));
+    unsupported = provider.checkPropertyIds(Collections.singleton("HostRoles"));
     Assert.assertTrue(unsupported.isEmpty());
 
     unsupported = provider.checkPropertyIds(Collections.singleton("config"));
@@ -587,8 +563,7 @@ public class HostComponentResourceProviderTest {
     provider.setFieldValue("maintenanceStateHelper", maintenanceStateHelper);
     provider.setFieldValue("hostVersionDAO", hostVersionDAO);
 
-    expect(resourceProviderFactory.getHostComponentResourceProvider(EasyMock.anyObject(),
-        EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostComponentResourceProvider(
         eq(managementController))).
         andReturn(provider).anyTimes();
 
@@ -657,7 +632,7 @@ public class HostComponentResourceProviderTest {
      */
     public TestHostComponentResourceProvider(Set<String> propertyIds, Map<Resource.Type, String> keyPropertyIds,
                                              AmbariManagementController managementController, Injector injector) throws Exception {
-      super(propertyIds, keyPropertyIds, managementController, injector);
+      super(managementController, injector);
     }
 
     public void setFieldValue(String fieldName, Object fieldValue) throws Exception {

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
index 5e6201b..fcf1950 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
@@ -153,8 +153,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
 
     expect(managementController.getClusters()).andReturn(clusters).atLeastOnce();
 
-    expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(),
-        EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostResourceProvider(
         eq(managementController))).andReturn(hostResourceProvider).anyTimes();
 
     // replay
@@ -164,8 +163,6 @@ public class HostResourceProviderTest extends EasyMockSupport {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     // add the property map to a set for the request.  add more maps for multiple creates
@@ -244,8 +241,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
     expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes();
     expect(managementController.getHostComponents(EasyMock.anyObject()))
         .andReturn(Collections.emptySet()).anyTimes();
-    expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(),
-            EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostResourceProvider(
             eq(managementController))).
         andReturn(hostResourceProvider).anyTimes();
 
@@ -277,8 +273,6 @@ public class HostResourceProviderTest extends EasyMockSupport {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
 
@@ -358,8 +352,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
 
     expect(componentInfo.getCategory()).andReturn("MASTER").anyTimes();
 
-    expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(),
-        EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostResourceProvider(
         eq(managementController))).andReturn(hostResourceProvider).anyTimes();
 
     Set<String> propertyIds = new HashSet<>();
@@ -378,8 +371,6 @@ public class HostResourceProviderTest extends EasyMockSupport {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     Set<Resource> resources = provider.getResources(request, predicate);
@@ -453,8 +444,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
 
     expect(componentInfo.getCategory()).andReturn("MASTER").anyTimes();
 
-    expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(),
-        EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostResourceProvider(
         eq(managementController))).andReturn(hostResourceProvider).anyTimes();
 
     Set<String> propertyIds = new HashSet<>();
@@ -473,8 +463,6 @@ public class HostResourceProviderTest extends EasyMockSupport {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
 
@@ -550,8 +538,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
 
     expect(componentInfo.getCategory()).andReturn("MASTER").anyTimes();
 
-    expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(),
-        EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostResourceProvider(
         eq(managementController))).andReturn(hostResourceProvider).anyTimes();
 
     Set<String> propertyIds = new HashSet<>();
@@ -570,8 +557,6 @@ public class HostResourceProviderTest extends EasyMockSupport {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     Set<Resource> resources = provider.getResources(request, predicate);
@@ -624,8 +609,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
     expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes();
     expect(hostResponse1.getStatus()).andReturn(HealthStatus.UNKNOWN.name()).anyTimes();
     expect(hostResponse1.getHealthReport()).andReturn("UNKNOWN").anyTimes();
-    expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(),
-        EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostResourceProvider(
         eq(managementController))).andReturn(hostResourceProvider).anyTimes();
 
     Set<String> propertyIds = new HashSet<>();
@@ -644,8 +628,6 @@ public class HostResourceProviderTest extends EasyMockSupport {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     Set<Resource> resources = provider.getResources(request, predicate);
@@ -728,8 +710,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
     expect(ambariMetaInfo.getComponent((String) anyObject(), (String) anyObject(),
         (String) anyObject(), (String) anyObject())).andReturn(componentInfo).anyTimes();
     expect(componentInfo.getCategory()).andReturn("SLAVE").anyTimes();
-    expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(),
-        EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostResourceProvider(
         eq(managementController))).andReturn(hostResourceProvider).anyTimes();
 
 
@@ -750,8 +731,6 @@ public class HostResourceProviderTest extends EasyMockSupport {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     Set<Resource> resources = provider.getResources(request, predicate);
@@ -824,8 +803,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
     expect(ambariMetaInfo.getComponent((String) anyObject(), (String) anyObject(),
         (String) anyObject(), (String) anyObject())).andReturn(componentInfo).anyTimes();
     expect(componentInfo.getCategory()).andReturn("SLAVE").anyTimes();
-    expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(),
-        EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostResourceProvider(
         eq(managementController))).andReturn(hostResourceProvider).anyTimes();
 
 
@@ -845,8 +823,6 @@ public class HostResourceProviderTest extends EasyMockSupport {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
 
@@ -920,8 +896,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
     expect(hostResponse1.getClusterName()).andReturn("Cluster100").anyTimes();
     expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes();
     expect(hostResponse1.getHealthReport()).andReturn("HEALTHY").anyTimes();
-    expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(),
-        EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostResourceProvider(
         eq(managementController))).andReturn(hostResourceProvider).anyTimes();
 
     // replay
@@ -945,8 +920,6 @@ public class HostResourceProviderTest extends EasyMockSupport {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         Resource.Type.Host,
-        PropertyHelper.getPropertyIds(Resource.Type.Host),
-        PropertyHelper.getKeyPropertyIds(Resource.Type.Host),
         managementController);
 
     provider.updateResources(request, predicate);
@@ -1008,8 +981,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
     expect(hostResponse1.getClusterName()).andReturn("Cluster100").anyTimes();
     expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes();
     expect(hostResponse1.getHealthReport()).andReturn("HEALTHY").anyTimes();
-    expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(),
-        EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostResourceProvider(
         eq(managementController))).andReturn(hostResourceProvider).anyTimes();
 
     // replay
@@ -1019,8 +991,6 @@ public class HostResourceProviderTest extends EasyMockSupport {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     // add the property map to a set for the request.
@@ -1106,8 +1076,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
   public static HostResourceProvider getHostProvider(AmbariManagementController managementController) {
     Resource.Type type = Resource.Type.Host;
 
-    return new HostResourceProvider(PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
+    return new HostResourceProvider(
         managementController);
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java
index 6c95c53..670c187 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java
@@ -185,8 +185,6 @@ public class HostStackVersionResourceProviderTest {
     Request request = PropertyHelper.getCreateRequest(Collections.emptySet(), null);
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
             type,
-            PropertyHelper.getPropertyIds(type),
-            PropertyHelper.getKeyPropertyIds(type),
             managementController);
 
     expect(hostVersionDAOMock.findByClusterAndHost(clustername, hostname)).andReturn(Collections.singletonList(hostVersionEntityMock));
@@ -234,7 +232,7 @@ public class HostStackVersionResourceProviderTest {
     expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class),
             EasyMock.anyObject(), anyObject(String.class))).andReturn(packages).anyTimes();
 
-    expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostResourceProvider(
         eq(managementController))).andReturn(csvResourceProvider).anyTimes();
 
     expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster);
@@ -270,8 +268,6 @@ public class HostStackVersionResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
         type,
-        PropertyHelper.getPropertyIds(type),
-        PropertyHelper.getKeyPropertyIds(type),
         managementController);
 
     injector.injectMembers(provider);
@@ -330,7 +326,7 @@ public class HostStackVersionResourceProviderTest {
     expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class),
       anyObject(Map.class), anyObject(String.class))).andReturn(packages).anyTimes();
 
-    expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class),
+    expect(resourceProviderFactory.getHostResourceProvider(
       eq(managementController))).andReturn(csvResourceProvider).anyTimes();
 
     expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster);
@@ -358,8 +354,6 @@ public class HostStackVersionResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
       type,
-      PropertyHelper.getPropertyIds(type),
-      PropertyHelper.getKeyPropertyIds(type),
       managementController);
 
     injector.injectMembers(provider);
@@ -428,7 +422,7 @@ public class HostStackVersionResourceProviderTest {
     expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class),
             EasyMock.anyObject(), anyObject(String.class))).andReturn(packages).anyTimes();
 
-    expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(),
+    expect(resourceProviderFactory.getHostResourceProvider(
             eq(managementController))).andReturn(csvResourceProvider).anyTimes();
 
     expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster);
@@ -464,8 +458,6 @@ public class HostStackVersionResourceProviderTest {
 
     ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
             type,
-            PropertyHelper.getPropertyIds(type),
-            PropertyHelper.getKeyPropertyIds(type),
             managementController);
 
     injector.injectMembers(provider);


Mime
View raw message