http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_select_packages.json
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_select_packages.json
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_select_packages.json
deleted file mode 100644
index 2747188..0000000
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_select_packages.json
+++ /dev/null
@@ -1,952 +0,0 @@
-{
-  "HDP": {
-    "stack-select": {
-      "ACCUMULO": {
-        "ACCUMULO_CLIENT": {
-          "STACK-SELECT-PACKAGE": "accumulo-client",
-          "INSTALL": [
-            "accumulo-client"
-          ],
-          "PATCH": [
-            "accumulo-client"
-          ],
-          "STANDARD": [
-            "accumulo-client"
-          ]
-        },
-        "ACCUMULO_GC": {
-          "STACK-SELECT-PACKAGE": "accumulo-gc",
-          "INSTALL": [
-            "accumulo-gc"
-          ],
-          "PATCH": [
-            "accumulo-gc"
-          ],
-          "STANDARD": [
-            "accumulo-gc",
-            "accumulo-client"
-          ]
-        },
-        "ACCUMULO_MASTER": {
-          "STACK-SELECT-PACKAGE": "accumulo-master",
-          "INSTALL": [
-            "accumulo-master"
-          ],
-          "PATCH": [
-            "accumulo-master"
-          ],
-          "STANDARD": [
-            "accumulo-master",
-            "accumulo-client"
-          ]
-        },
-        "ACCUMULO_MONITOR": {
-          "STACK-SELECT-PACKAGE": "accumulo-monitor",
-          "INSTALL": [
-            "accumulo-monitor"
-          ],
-          "PATCH": [
-            "accumulo-monitor"
-          ],
-          "STANDARD": [
-            "accumulo-monitor",
-            "accumulo-client"
-          ]
-        },
-        "ACCUMULO_TRACER": {
-          "STACK-SELECT-PACKAGE": "accumulo-tracer",
-          "INSTALL": [
-            "accumulo-tracer"
-          ],
-          "PATCH": [
-            "accumulo-tracer"
-          ],
-          "STANDARD": [
-            "accumulo-tracer",
-            "accumulo-client"
-          ]
-        },
-        "ACCUMULO_TSERVER": {
-          "STACK-SELECT-PACKAGE": "accumulo-tablet",
-          "INSTALL": [
-            "accumulo-tablet"
-          ],
-          "PATCH": [
-            "accumulo-tablet"
-          ],
-          "STANDARD": [
-            "accumulo-tablet",
-            "accumulo-client"
-          ]
-        }
-      },
-      "ATLAS": {
-        "ATLAS_CLIENT": {
-          "STACK-SELECT-PACKAGE": "atlas-client",
-          "INSTALL": [
-            "atlas-client"
-          ],
-          "PATCH": [
-            "atlas-client"
-          ],
-          "STANDARD": [
-            "atlas-client"
-          ]
-        },
-        "ATLAS_SERVER": {
-          "STACK-SELECT-PACKAGE": "atlas-server",
-          "INSTALL": [
-            "atlas-server"
-          ],
-          "PATCH": [
-            "atlas-server"
-          ],
-          "STANDARD": [
-            "atlas-server"
-          ]
-        }
-      },
-      "DRUID": {
-        "DRUID_COORDINATOR": {
-          "STACK-SELECT-PACKAGE": "druid-coordinator",
-          "INSTALL": [
-            "druid-coordinator"
-          ],
-          "PATCH": [
-            "druid-coordinator"
-          ],
-          "STANDARD": [
-            "druid-coordinator"
-          ]
-        },
-        "DRUID_OVERLORD": {
-          "STACK-SELECT-PACKAGE": "druid-overlord",
-          "INSTALL": [
-            "druid-overlord"
-          ],
-          "PATCH": [
-            "druid-overlord"
-          ],
-          "STANDARD": [
-            "druid-overlord"
-          ]
-        },
-        "DRUID_HISTORICAL": {
-          "STACK-SELECT-PACKAGE": "druid-historical",
-          "INSTALL": [
-            "druid-historical"
-          ],
-          "PATCH": [
-            "druid-historical"
-          ],
-          "STANDARD": [
-            "druid-historical"
-          ]
-        },
-        "DRUID_BROKER": {
-          "STACK-SELECT-PACKAGE": "druid-broker",
-          "INSTALL": [
-            "druid-broker"
-          ],
-          "PATCH": [
-            "druid-broker"
-          ],
-          "STANDARD": [
-            "druid-broker"
-          ]
-        },
-        "DRUID_MIDDLEMANAGER": {
-          "STACK-SELECT-PACKAGE": "druid-middlemanager",
-          "INSTALL": [
-            "druid-middlemanager"
-          ],
-          "PATCH": [
-            "druid-middlemanager"
-          ],
-          "STANDARD": [
-            "druid-middlemanager"
-          ]
-        },
-        "DRUID_ROUTER": {
-          "STACK-SELECT-PACKAGE": "druid-router",
-          "INSTALL": [
-            "druid-router"
-          ],
-          "PATCH": [
-            "druid-router"
-          ],
-          "STANDARD": [
-            "druid-router"
-          ]
-        },
-        "DRUID_SUPERSET": {
-          "STACK-SELECT-PACKAGE": "druid-superset",
-          "INSTALL": [
-            "druid-superset"
-          ],
-          "PATCH": [
-            "druid-superset"
-          ],
-          "STANDARD": [
-            "druid-superset"
-          ]
-        }
-      },
-      "FALCON": {
-        "FALCON_CLIENT": {
-          "STACK-SELECT-PACKAGE": "falcon-client",
-          "INSTALL": [
-            "falcon-client"
-          ],
-          "PATCH": [
-            "falcon-client"
-          ],
-          "STANDARD": [
-            "falcon-client"
-          ]
-        },
-        "FALCON_SERVER": {
-          "STACK-SELECT-PACKAGE": "falcon-server",
-          "INSTALL": [
-            "falcon-server"
-          ],
-          "PATCH": [
-            "falcon-server"
-          ],
-          "STANDARD": [
-            "falcon-server"
-          ]
-        }
-      },
-      "FLUME": {
-        "FLUME_HANDLER": {
-          "STACK-SELECT-PACKAGE": "flume-server",
-          "INSTALL": [
-            "flume-server"
-          ],
-          "PATCH": [
-            "flume-server"
-          ],
-          "STANDARD": [
-            "flume-server"
-          ]
-        }
-      },
-      "HBASE": {
-        "HBASE_CLIENT": {
-          "STACK-SELECT-PACKAGE": "hbase-client",
-          "INSTALL": [
-            "hbase-client"
-          ],
-          "PATCH": [
-            "hbase-client"
-          ],
-          "STANDARD": [
-            "hbase-client",
-            "phoenix-client",
-            "hadoop-client"
-          ]
-        },
-        "HBASE_MASTER": {
-          "STACK-SELECT-PACKAGE": "hbase-master",
-          "INSTALL": [
-            "hbase-master"
-          ],
-          "PATCH": [
-            "hbase-master"
-          ],
-          "STANDARD": [
-            "hbase-master"
-          ]
-        },
-        "HBASE_REGIONSERVER": {
-          "STACK-SELECT-PACKAGE": "hbase-regionserver",
-          "INSTALL": [
-            "hbase-regionserver"
-          ],
-          "PATCH": [
-            "hbase-regionserver"
-          ],
-          "STANDARD": [
-            "hbase-regionserver"
-          ]
-        },
-        "PHOENIX_QUERY_SERVER": {
-          "STACK-SELECT-PACKAGE": "phoenix-server",
-          "INSTALL": [
-            "phoenix-server"
-          ],
-          "PATCH": [
-            "phoenix-server"
-          ],
-          "STANDARD": [
-            "phoenix-server"
-          ]
-        }
-      },
-      "HDFS": {
-        "DATANODE": {
-          "STACK-SELECT-PACKAGE": "hadoop-hdfs-datanode",
-          "INSTALL": [
-            "hadoop-hdfs-datanode"
-          ],
-          "PATCH": [
-            "hadoop-hdfs-datanode"
-          ],
-          "STANDARD": [
-            "hadoop-hdfs-datanode"
-          ]
-        },
-        "HDFS_CLIENT": {
-          "STACK-SELECT-PACKAGE": "hadoop-client",
-          "INSTALL": [
-            "hadoop-client"
-          ],
-          "PATCH": [
-            "INVALID"
-          ],
-          "STANDARD": [
-            "hadoop-client"
-          ]
-        },
-        "NAMENODE": {
-          "STACK-SELECT-PACKAGE": "hadoop-hdfs-namenode",
-          "INSTALL": [
-            "hadoop-hdfs-namenode"
-          ],
-          "PATCH": [
-            "hadoop-hdfs-namenode"
-          ],
-          "STANDARD": [
-            "hadoop-hdfs-namenode"
-          ]
-        },
-        "NFS_GATEWAY": {
-          "STACK-SELECT-PACKAGE": "hadoop-hdfs-nfs3",
-          "INSTALL": [
-            "hadoop-hdfs-nfs3"
-          ],
-          "PATCH": [
-            "hadoop-hdfs-nfs3"
-          ],
-          "STANDARD": [
-            "hadoop-hdfs-nfs3"
-          ]
-        },
-        "JOURNALNODE": {
-          "STACK-SELECT-PACKAGE": "hadoop-hdfs-journalnode",
-          "INSTALL": [
-            "hadoop-hdfs-journalnode"
-          ],
-          "PATCH": [
-            "hadoop-hdfs-journalnode"
-          ],
-          "STANDARD": [
-            "hadoop-hdfs-journalnode"
-          ]
-        },
-        "SECONDARY_NAMENODE": {
-          "STACK-SELECT-PACKAGE": "hadoop-hdfs-secondarynamenode",
-          "INSTALL": [
-            "hadoop-hdfs-secondarynamenode"
-          ],
-          "PATCH": [
-            "hadoop-hdfs-secondarynamenode"
-          ],
-          "STANDARD": [
-            "hadoop-hdfs-secondarynamenode"
-          ]
-        },
-        "ZKFC": {
-          "STACK-SELECT-PACKAGE": "hadoop-hdfs-zkfc",
-          "INSTALL": [
-            "hadoop-hdfs-zkfc"
-          ],
-          "PATCH": [
-            "hadoop-hdfs-zkfc"
-          ],
-          "STANDARD": [
-            "hadoop-hdfs-zkfc"
-          ]
-        }
-      },
-      "HIVE": {
-        "HCAT": {
-          "STACK-SELECT-PACKAGE": "hive-webhcat",
-          "INSTALL": [
-            "hive-webhcat"
-          ],
-          "PATCH": [
-            "hive-webhcat"
-          ],
-          "STANDARD": [
-            "hive-webhcat"
-          ]
-        },
-        "HIVE_METASTORE": {
-          "STACK-SELECT-PACKAGE": "hive-metastore",
-          "INSTALL": [
-            "hive-metastore"
-          ],
-          "PATCH": [
-            "hive-metastore"
-          ],
-          "STANDARD": [
-            "hive-metastore"
-          ]
-        },
-        "HIVE_SERVER": {
-          "STACK-SELECT-PACKAGE": "hive-server2",
-          "INSTALL": [
-            "hive-server2"
-          ],
-          "PATCH": [
-            "hive-server2"
-          ],
-          "STANDARD": [
-            "hive-server2"
-          ]
-        },
-        "HIVE_SERVER_INTERACTIVE": {
-          "STACK-SELECT-PACKAGE": "hive-server2-hive2",
-          "INSTALL": [
-            "hive-server2-hive2"
-          ],
-          "PATCH": [
-            "hive-server2-hive2"
-          ],
-          "STANDARD": [
-            "hive-server2-hive2"
-          ]
-        },
-        "HIVE_CLIENT": {
-          "STACK-SELECT-PACKAGE": "hadoop-client",
-          "INSTALL": [
-            "hadoop-client"
-          ],
-          "PATCH": [
-            "INVALID"
-          ],
-          "STANDARD": [
-            "hadoop-client"
-          ]
-        },
-        "WEBHCAT_SERVER": {
-          "STACK-SELECT-PACKAGE": "hive-webhcat",
-          "INSTALL": [
-            "hive-webhcat"
-          ],
-          "PATCH": [
-            "hive-webhcat"
-          ],
-          "STANDARD": [
-            "hive-webhcat"
-          ]
-        }
-      },
-      "KAFKA": {
-        "KAFKA_BROKER": {
-          "STACK-SELECT-PACKAGE": "kafka-broker",
-          "INSTALL": [
-            "kafka-broker"
-          ],
-          "PATCH": [
-            "kafka-broker"
-          ],
-          "STANDARD": [
-            "kafka-broker"
-          ]
-        }
-      },
-      "KNOX": {
-        "KNOX_GATEWAY": {
-          "STACK-SELECT-PACKAGE": "knox-server",
-          "INSTALL": [
-            "knox-server"
-          ],
-          "PATCH": [
-            "knox-server"
-          ],
-          "STANDARD": [
-            "knox-server"
-          ]
-        }
-      },
-      "MAHOUT": {
-        "MAHOUT": {
-          "STACK-SELECT-PACKAGE": "mahout-client",
-          "INSTALL": [
-            "mahout-client"
-          ],
-          "PATCH": [
-            "mahout-client"
-          ],
-          "STANDARD": [
-            "mahout-client"
-          ]
-        }
-      },
-      "MAPREDUCE2": {
-        "HISTORYSERVER": {
-          "STACK-SELECT-PACKAGE": "hadoop-mapreduce-historyserver",
-          "INSTALL": [
-            "hadoop-mapreduce-historyserver"
-          ],
-          "PATCH": [
-            "hadoop-mapreduce-historyserver"
-          ],
-          "STANDARD": [
-            "hadoop-mapreduce-historyserver"
-          ]
-        },
-        "MAPREDUCE2_CLIENT": {
-          "STACK-SELECT-PACKAGE": "hadoop-client",
-          "INSTALL": [
-            "hadoop-client"
-          ],
-          "PATCH": [
-            "hadoop-mapreduce-INVALID"
-          ],
-          "STANDARD": [
-            "hadoop-client"
-          ]
-        }
-      },
-      "OOZIE": {
-        "OOZIE_CLIENT": {
-          "STACK-SELECT-PACKAGE": "oozie-client",
-          "INSTALL": [
-            "oozie-client"
-          ],
-          "PATCH": [
-            "oozie-client"
-          ],
-          "STANDARD": [
-            "oozie-client"
-          ]
-        },
-        "OOZIE_SERVER": {
-          "STACK-SELECT-PACKAGE": "oozie-server",
-          "INSTALL": [
-            "oozie-client",
-            "oozie-server"
-          ],
-          "PATCH": [
-            "oozie-server"
-          ],
-          "STANDARD": [
-            "oozie-client",
-            "oozie-server"
-          ]
-        }
-      },
-      "PIG": {
-        "PIG": {
-          "STACK-SELECT-PACKAGE": "hadoop-client",
-          "INSTALL": [
-            "hadoop-client"
-          ],
-          "PATCH": [
-            "INVALID"
-          ],
-          "STANDARD": [
-            "hadoop-client"
-          ]
-        }
-      },
-      "R4ML": {
-        "R4ML": {
-          "STACK-SELECT-PACKAGE": "r4ml-client",
-          "INSTALL": [
-            "r4ml-client"
-          ],
-          "PATCH": [
-            "r4ml-client"
-          ],
-          "STANDARD": [
-            "r4ml-client"
-          ]
-        }
-      },
-      "RANGER": {
-        "RANGER_ADMIN": {
-          "STACK-SELECT-PACKAGE": "ranger-admin",
-          "INSTALL": [
-            "ranger-admin"
-          ],
-          "PATCH": [
-            "ranger-admin"
-          ],
-          "STANDARD": [
-            "ranger-admin"
-          ]
-        },
-        "RANGER_TAGSYNC": {
-          "STACK-SELECT-PACKAGE": "ranger-tagsync",
-          "INSTALL": [
-            "ranger-tagsync"
-          ],
-          "PATCH": [
-            "ranger-tagsync"
-          ],
-          "STANDARD": [
-            "ranger-tagsync"
-          ]
-        },
-        "RANGER_USERSYNC": {
-          "STACK-SELECT-PACKAGE": "ranger-usersync",
-          "INSTALL": [
-            "ranger-usersync"
-          ],
-          "PATCH": [
-            "ranger-usersync"
-          ],
-          "STANDARD": [
-            "ranger-usersync"
-          ]
-        }
-      },
-      "RANGER_KMS": {
-        "RANGER_KMS_SERVER": {
-          "STACK-SELECT-PACKAGE": "ranger-kms",
-          "INSTALL": [
-            "ranger-kms"
-          ],
-          "PATCH": [
-            "ranger-kms"
-          ],
-          "STANDARD": [
-            "ranger-kms"
-          ]
-        }
-      },
-      "SLIDER": {
-        "SLIDER": {
-          "STACK-SELECT-PACKAGE": "slider-client",
-          "INSTALL": [
-            "slider-client"
-          ],
-          "PATCH": [
-            "slider-client"
-          ],
-          "STANDARD": [
-            "slider-client",
-            "hadoop-client"
-          ]
-        }
-      },
-      "SPARK": {
-        "LIVY_SERVER": {
-          "STACK-SELECT-PACKAGE": "livy-server",
-          "INSTALL": [
-            "livy-server"
-          ],
-          "PATCH": [
-            "livy-server"
-          ],
-          "STANDARD": [
-            "livy-server"
-          ]
-        },
-        "SPARK_CLIENT": {
-          "STACK-SELECT-PACKAGE": "spark-client",
-          "INSTALL": [
-            "spark-client"
-          ],
-          "PATCH": [
-            "spark-client"
-          ],
-          "STANDARD": [
-            "spark-client"
-          ]
-        },
-        "SPARK_JOBHISTORYSERVER": {
-          "STACK-SELECT-PACKAGE": "spark-historyserver",
-          "INSTALL": [
-            "spark-historyserver"
-          ],
-          "PATCH": [
-            "spark-historyserver"
-          ],
-          "STANDARD": [
-            "spark-historyserver"
-          ]
-        },
-        "SPARK_THRIFTSERVER": {
-          "STACK-SELECT-PACKAGE": "spark-thriftserver",
-          "INSTALL": [
-            "spark-thriftserver"
-          ],
-          "PATCH": [
-            "spark-thriftserver"
-          ],
-          "STANDARD": [
-            "spark-thriftserver"
-          ]
-        }
-      },
-      "SPARK2": {
-        "LIVY2_SERVER": {
-          "STACK-SELECT-PACKAGE": "livy2-server",
-          "INSTALL": [
-            "livy2-server"
-          ],
-          "PATCH": [
-            "livy2-server"
-          ],
-          "STANDARD": [
-            "livy2-server"
-          ]
-        },
-        "SPARK2_CLIENT": {
-          "STACK-SELECT-PACKAGE": "spark2-client",
-          "INSTALL": [
-            "spark2-client"
-          ],
-          "PATCH": [
-            "spark2-client"
-          ],
-          "STANDARD": [
-            "spark2-client"
-          ]
-        },
-        "SPARK2_JOBHISTORYSERVER": {
-          "STACK-SELECT-PACKAGE": "spark2-historyserver",
-          "INSTALL": [
-            "spark2-historyserver"
-          ],
-          "PATCH": [
-            "spark2-historyserver"
-          ],
-          "STANDARD": [
-            "spark2-historyserver"
-          ]
-        },
-        "SPARK2_THRIFTSERVER": {
-          "STACK-SELECT-PACKAGE": "spark2-thriftserver",
-          "INSTALL": [
-            "spark2-thriftserver"
-          ],
-          "PATCH": [
-            "spark2-thriftserver"
-          ],
-          "STANDARD": [
-            "spark2-thriftserver"
-          ]
-        }
-      },
-      "SQOOP": {
-        "SQOOP": {
-          "STACK-SELECT-PACKAGE": "sqoop-client",
-          "INSTALL": [
-            "sqoop-client"
-          ],
-          "PATCH": [
-            "sqoop-client"
-          ],
-          "STANDARD": [
-            "sqoop-client"
-          ]
-        }
-      },
-      "STORM": {
-        "NIMBUS": {
-          "STACK-SELECT-PACKAGE": "storm-nimbus",
-          "INSTALL": [
-            "storm-client",
-            "storm-nimbus"
-          ],
-          "PATCH": [
-            "storm-client",
-            "storm-nimbus"
-          ],
-          "STANDARD": [
-            "storm-client",
-            "storm-nimbus"
-          ]
-        },
-        "SUPERVISOR": {
-          "STACK-SELECT-PACKAGE": "storm-supervisor",
-          "INSTALL": [
-            "storm-supervisor"
-          ],
-          "PATCH": [
-            "storm-supervisor"
-          ],
-          "STANDARD": [
-            "storm-client",
-            "storm-supervisor"
-          ]
-        },
-        "DRPC_SERVER": {
-          "STACK-SELECT-PACKAGE": "storm-client",
-          "INSTALL": [
-            "storm-client"
-          ],
-          "PATCH": [
-            "storm-client"
-          ],
-          "STANDARD": [
-            "storm-client"
-          ]
-        },
-        "STORM_UI_SERVER": {
-          "STACK-SELECT-PACKAGE": "storm-client",
-          "INSTALL": [
-            "storm-client"
-          ],
-          "PATCH": [
-            "storm-client"
-          ],
-          "STANDARD": [
-            "storm-client"
-          ]
-        }
-      },
-      "SYSTEMML": {
-        "SYSTEMML": {
-          "STACK-SELECT-PACKAGE": "systemml-client",
-          "INSTALL": [
-            "systemml-client"
-          ],
-          "PATCH": [
-            "systemml-client"
-          ],
-          "STANDARD": [
-            "systemml-client"
-          ]
-        }
-      },
-      "TEZ": {
-        "TEZ_CLIENT": {
-          "STACK-SELECT-PACKAGE": "hadoop-client",
-          "INSTALL": [
-            "hadoop-client"
-          ],
-          "PATCH": [
-            "INVALID"
-          ],
-          "STANDARD": [
-            "hadoop-client"
-          ]
-        }
-      },
-      "TITAN": {
-        "TITAN_CLIENT": {
-          "STACK-SELECT-PACKAGE": "titan-client",
-          "INSTALL": [
-            "titan-client"
-          ],
-          "PATCH": [
-            "titan-client"
-          ],
-          "STANDARD": [
-            "titan-client"
-          ]
-        },
-        "TITAN_SERVER": {
-          "STACK-SELECT-PACKAGE": "titan-server",
-          "INSTALL": [
-            "titan-server"
-          ],
-          "PATCH": [
-            "titan-server"
-          ],
-          "STANDARD": [
-            "titan-server"
-          ]
-        }
-      },
-      "YARN": {
-        "APP_TIMELINE_SERVER": {
-          "STACK-SELECT-PACKAGE": "hadoop-yarn-timelineserver",
-          "INSTALL": [
-            "hadoop-yarn-timelineserver"
-          ],
-          "PATCH": [
-            "hadoop-yarn-timelineserver"
-          ],
-          "STANDARD": [
-            "hadoop-yarn-timelineserver"
-          ]
-        },
-        "NODEMANAGER": {
-          "STACK-SELECT-PACKAGE": "hadoop-yarn-nodemanager",
-          "INSTALL": [
-            "hadoop-yarn-nodemanager"
-          ],
-          "PATCH": [
-            "hadoop-yarn-nodemanager"
-          ],
-          "STANDARD": [
-            "hadoop-yarn-nodemanager"
-          ]
-        },
-        "RESOURCEMANAGER": {
-          "STACK-SELECT-PACKAGE": "hadoop-yarn-resourcemanager",
-          "INSTALL": [
-            "hadoop-yarn-resourcemanager"
-          ],
-          "PATCH": [
-            "hadoop-yarn-resourcemanager"
-          ],
-          "STANDARD": [
-            "hadoop-yarn-resourcemanager"
-          ]
-        },
-        "YARN_CLIENT": {
-          "STACK-SELECT-PACKAGE": "hadoop-client",
-          "INSTALL": [
-            "hadoop-client"
-          ],
-          "PATCH": [
-            "INVALID"
-          ],
-          "STANDARD": [
-            "hadoop-client"
-          ]
-        }
-      },
-      "ZEPPELIN": {
-        "ZEPPELIN_MASTER": {
-          "STACK-SELECT-PACKAGE": "zeppelin-server",
-          "INSTALL": [
-            "zeppelin-server"
-          ],
-          "PATCH": [
-            "zeppelin-server"
-          ],
-          "STANDARD": [
-            "zeppelin-server"
-          ]
-        }
-      },
-      "ZOOKEEPER": {
-        "ZOOKEEPER_CLIENT": {
-          "STACK-SELECT-PACKAGE": "zookeeper-client",
-          "INSTALL": [
-            "zookeeper-client"
-          ],
-          "PATCH": [
-            "zookeeper-client"
-          ],
-          "STANDARD": [
-            "zookeeper-client"
-          ]
-        },
-        "ZOOKEEPER_SERVER": {
-          "STACK-SELECT-PACKAGE": "zookeeper-server",
-          "INSTALL": [
-            "zookeeper-server"
-          ],
-          "PATCH": [
-            "zookeeper-server"
-          ],
-          "STANDARD": [
-            "zookeeper-server"
-          ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/custom_actions/test_ru_set_all.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/custom_actions/test_ru_set_all.py 
b/ambari-server/src/test/python/custom_actions/test_ru_set_all.py
index 8c36ad6..d106842 100644
--- a/ambari-server/src/test/python/custom_actions/test_ru_set_all.py
+++ b/ambari-server/src/test/python/custom_actions/test_ru_set_all.py
@@ -118,10 +118,12 @@ class TestRUSetAll(RMFTestCase):
     with open(json_file_path, "r") as json_file:
       json_payload = json.load(json_file)
 
+    json_payload['hostLevelParams']['stack_name'] = "HDP"
     json_payload['hostLevelParams']['stack_version'] = "2.3"
     json_payload['commandParams']['version'] = "2.3.0.0-1234"
     json_payload["configurations"]["cluster-env"]["stack_tools"] = 
self.get_stack_tools()
     json_payload["configurations"]["cluster-env"]["stack_features"] = 
self.get_stack_features()
+    json_payload["configurations"]["cluster-env"]["stack_packages"] = 
self.get_stack_packages()
 
     config_dict = ConfigDictionary(json_payload)
 
@@ -198,109 +200,6 @@ class TestRUSetAll(RMFTestCase):
     self.assertEqual(call_mock.call_count, 1)
 
 
-  @patch("os.path.islink")
-  @patch("os.path.isdir")
-  @patch("resource_management.core.shell.call")
-  @patch.object(Script, 'get_config')
-  @patch.object(OSCheck, 'is_redhat_family')
-  def test_downgrade_unlink_configs(self, family_mock, get_config_mock, 
call_mock,
-                                    isdir_mock, islink_mock):
-    """
-    Tests downgrading from 2.3 to 2.2 to ensure that conf symlinks are removed 
and the backup
-    directories restored.
-    """
-
-    isdir_mock.return_value = True
-
-    # required for the test to run since the Execute calls need this
-    from resource_management.core.environment import Environment
-    env = Environment(test_mode=True)
-    with env:
-      # Mock the config objects
-      json_file_path = os.path.join(self.get_custom_actions_dir(), 
"ru_execute_tasks_namenode_prepare.json")
-      self.assertTrue(os.path.isfile(json_file_path))
-      with open(json_file_path, "r") as json_file:
-        json_payload = json.load(json_file)
-
-      # alter JSON for a downgrade from 2.3 to 2.2
-      json_payload['commandParams']['version'] = "2.2.0.0-1234"
-      json_payload['commandParams']['downgrade_from_version'] = "2.3.0.0-1234"
-      json_payload['commandParams']['source_stack'] = "HDP-2.2"
-      json_payload['commandParams']['target_stack'] = "HDP-2.3"
-      json_payload['commandParams']['upgrade_direction'] = "downgrade"
-      json_payload['hostLevelParams']['stack_version'] = "2.2"
-      json_payload["configurations"]["cluster-env"]["stack_tools"] = 
self.get_stack_tools()
-      json_payload["configurations"]["cluster-env"]["stack_features"] = 
self.get_stack_features()
-
-      config_dict = ConfigDictionary(json_payload)
-
-      family_mock.return_value = True
-      get_config_mock.return_value = config_dict
-      call_mock.side_effect = fake_call   # echo the command
-
-      # test the function
-      ru_execute = UpgradeSetAll()
-      ru_execute.unlink_all_configs(None)
-
-      # verify that os.path.islink was called for each conf
-      self.assertFalse(islink_mock.called)
-
-      # alter JSON for a downgrade from 2.3 to 2.3
-      with open(json_file_path, "r") as json_file:
-        json_payload = json.load(json_file)
-
-      json_payload['commandParams']['version'] = "2.3.0.0-1234"
-      json_payload['commandParams']['downgrade_from_version'] = "2.3.0.0-5678"
-      json_payload['commandParams']['source_stack'] = "HDP-2.3"
-      json_payload['commandParams']['target_stack'] = "HDP-2.3"
-      json_payload['commandParams']['upgrade_direction'] = "downgrade"
-      json_payload['hostLevelParams']['stack_version'] = "2.3"
-      json_payload["configurations"]["cluster-env"]["stack_tools"] = 
self.get_stack_tools()
-      json_payload["configurations"]["cluster-env"]["stack_features"] = 
self.get_stack_features()
-
-      # reset config
-      config_dict = ConfigDictionary(json_payload)
-      family_mock.return_value = True
-      get_config_mock.return_value = config_dict
-
-      # reset mock
-      islink_mock.reset_mock()
-
-      # test the function
-      ru_execute = UpgradeSetAll()
-      ru_execute.unlink_all_configs(None)
-
-      # ensure it wasn't called this time
-      self.assertFalse(islink_mock.called)
-
-      with open(json_file_path, "r") as json_file:
-        json_payload = json.load(json_file)
-
-      # alter JSON for a downgrade from 2.2 to 2.2
-      json_payload['commandParams']['version'] = "2.2.0.0-1234"
-      json_payload['commandParams']['downgrade_from_version'] = "2.2.0.0-5678"
-      json_payload['commandParams']['source_stack'] = "HDP-2.2"
-      json_payload['commandParams']['target_stack'] = "HDP-2.2"
-      json_payload['commandParams']['upgrade_direction'] = "downgrade"
-      json_payload['hostLevelParams']['stack_version'] = "2.2"
-      json_payload["configurations"]["cluster-env"]["stack_tools"] = 
self.get_stack_tools()
-      json_payload["configurations"]["cluster-env"]["stack_features"] = 
self.get_stack_features()
-
-      # reset config
-      config_dict = ConfigDictionary(json_payload)
-      family_mock.return_value = True
-      get_config_mock.return_value = config_dict
-
-      # reset mock
-      islink_mock.reset_mock()
-
-      # test the function
-      ru_execute = UpgradeSetAll()
-      ru_execute.unlink_all_configs(None)
-
-      # ensure it wasn't called this time
-      self.assertFalse(islink_mock.called)
-
   @patch("os.path.exists")
   @patch("os.path.islink")
   @patch("os.path.isdir")

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py 
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
index 7c5c7f5..135b239 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
@@ -244,25 +244,8 @@ class TestHBaseClient(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None, ''), (0, None, 
''), (0, None, '')],
                        mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'hbase-client', version), sudo=True)
     self.assertResourceCalledIgnoreEarlier('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'phoenix-client', version), sudo=True)
     self.assertResourceCalledIgnoreEarlier('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True)
-
-    self.assertEquals(3, mocks_dict['call'].call_count)
-    self.assertEquals(6, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hbase', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[1][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hbase', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['checked_call'].call_args_list[5][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['call'].call_args_list[1][0][0])
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py 
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
index a47bda3..c3cc8f0 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
@@ -776,17 +776,6 @@ class TestHBaseMaster(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None, ''), (0, None, 
''), (0, None, '')],
                        mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'hbase-master', version), sudo=True)
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(3, mocks_dict['checked_call'].call_count)
-
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hbase', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[1][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hbase', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py 
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
index 6a2d8fb..6f27ecc 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
@@ -586,17 +586,7 @@ class TestHbaseRegionServer(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None), (0, None), (0, 
None)],
                        mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'hbase-regionserver', version), sudo=True)
 
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(3, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hbase', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[1][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hbase', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py 
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
index 973e274..972aa61 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
@@ -439,10 +439,5 @@ class TestPhoenixQueryServer(RMFTestCase):
       stack_version = self.STACK_VERSION,
       target = RMFTestCase.TARGET_COMMON_SERVICES)
 
-    self.assertResourceCalled('Directory', '/etc/hbase/2.3.0.0-1234/0',
-        create_parents = True,
-        mode = 0755,
-        cd_access = 'a',
-    )
     self.assertResourceCalledIgnoreEarlier('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'phoenix-server', '2.3.0.0-1234'), sudo=True)
     self.assertNoMoreResources()

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py 
b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
index 0f31ad2..966254a 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
@@ -510,22 +510,11 @@ class TestDatanode(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict = mocks_dict)
-    self.assertResourceCalled('Link', ('/etc/hadoop/conf'), 
to='/usr/hdp/current/hadoop-client/conf')
     self.assertResourceCalled('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'hadoop-hdfs-datanode', version), sudo=True,)
 
     self.assertNoMoreResources()
 
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['call'].call_args_list[0][0][0])
-
 
   @patch("socket.gethostbyname")
   @patch('time.sleep')

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py 
b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py
index 680c984..7a70578 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py
@@ -107,21 +107,11 @@ class Test(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True,)
     self.assertNoMoreResources()
 
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['call'].call_args_list[0][0][0])
-
   def test_pre_upgrade_restart(self):
     config_file = 
self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json"
     with open(config_file, "r") as f:

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py 
b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
index 06c5fdd..22e4827 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
@@ -412,16 +412,7 @@ class TestJournalnode(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict = mocks_dict)
 
-    self.assertResourceCalled('Link', ('/etc/hadoop/conf'), 
to='/usr/hdp/current/hadoop-client/conf')
     self.assertResourceCalled('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'hadoop-hdfs-journalnode', version), sudo=True,)
     self.assertNoMoreResources()
-
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['call'].call_args_list[0][0][0])

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py 
b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
index 0d27d15..ae51abf 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
@@ -1350,12 +1350,8 @@ class TestNamenode(RMFTestCase):
                        config_file = "nn_eu_standby.json",
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict=mocks_dict)
 
-    calls = mocks_dict['call'].call_args_list
-    self.assertTrue(len(calls) >= 1)
-    self.assertTrue(calls[0].startsWith("conf-select create-conf-dir --package 
hadoop --stack-version 2.3.2.0-2844 --conf-version 0"))
 
 
   @patch("hdfs_namenode.is_this_namenode_active")
@@ -1428,10 +1424,8 @@ class TestNamenode(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, None), (0, None), (0, None)],
                        mocks_dict = mocks_dict)
 
-    self.assertResourceCalled('Link', '/etc/hadoop/conf', 
to='/usr/hdp/current/hadoop-client/conf')
     self.assertResourceCalled('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'hadoop-hdfs-namenode', version), sudo=True)
     self.assertNoMoreResources()
 
@@ -1664,11 +1658,8 @@ class TestNamenode(RMFTestCase):
                        config_dict = json_content,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = itertools.cycle([(0, None, None)]),
                        mocks_dict = mocks_dict)
 
-    self.assertResourceCalled('Link', '/etc/hadoop/conf',
-      to = '/usr/hdp/current/hadoop-client/conf')
 
     import sys
     self.assertEquals("/usr/hdp/2.3.0.0-1234/hadoop/conf", 
sys.modules["params"].hadoop_conf_dir)

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py 
b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py
index 773d3fe..4317c30 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py
@@ -295,9 +295,7 @@ class TestNFSGateway(RMFTestCase):
                        config_dict = json_content,
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
-                       target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None), (0, None), (0, 
None)])
-    self.assertResourceCalled('Link', ('/etc/hadoop/conf'), 
to='/usr/hdp/current/hadoop-client/conf')
+                       target = RMFTestCase.TARGET_COMMON_SERVICES)
     self.assertResourceCalled('Execute',
                               ('ambari-python-wrap', '/usr/bin/hdp-select', 
'set', 'hadoop-hdfs-nfs3', version), sudo=True,)
     self.assertNoMoreResources()

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py 
b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
index 3bc597e..f7af5b9 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
@@ -227,25 +227,8 @@ class TestHiveClient(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None, ''), (0, None, 
''), (0, None, '')],
                        mocks_dict = mocks_dict)
 
-    self.assertResourceCalled('Link', ('/etc/hive/conf'), 
to='/usr/hdp/current/hive-client/conf')
     self.assertResourceCalledIgnoreEarlier('Execute',
                               ('ambari-python-wrap', '/usr/bin/hdp-select', 
'set', 'hadoop-client', version), sudo=True,)
     self.assertNoMoreResources()
-
-    self.assertEquals(2, mocks_dict['call'].call_count)
-    self.assertEquals(2, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hive', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hive', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['checked_call'].call_args_list[1][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['call'].call_args_list[1][0][0])

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py 
b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
index 512608c..6caadd3 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
@@ -907,10 +907,8 @@ From source with checksum 
150f554beae04f76f814f59549dead8b"""
                        config_dict = json_content,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None, '')],
                        mocks_dict = mocks_dict)
 
-    self.assertResourceCalled('Link', ('/etc/hive/conf'), 
to='/usr/hdp/current/hive-client/conf')
     self.assertResourceCalled('Execute',
 
                               ('ambari-python-wrap', '/usr/bin/hdp-select', 
'set', 'hive-server2', version), sudo=True,)
@@ -929,12 +927,3 @@ From source with checksum 
150f554beae04f76f814f59549dead8b"""
         hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
     )
     self.assertNoMoreResources()
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hive', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hive', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py 
b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
index a6a4fa0..943c201 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
@@ -314,7 +314,6 @@ class TestWebHCatServer(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None, '')],
                        mocks_dict = mocks_dict)
 
     self.assertTrue("params" in sys.modules)
@@ -325,20 +324,6 @@ class TestWebHCatServer(RMFTestCase):
                               ('ambari-python-wrap', '/usr/bin/hdp-select', 
'set', 'hive-webhcat', version), sudo=True,)
     self.assertNoMoreResources()
 
-    self.assertEquals(2, mocks_dict['call'].call_count)
-    self.assertEquals(2, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hive-hcatalog', '--stack-version', '2.3.0.0-1234', 
'--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hive-hcatalog', '--stack-version', '2.3.0.0-1234', 
'--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['checked_call'].call_args_list[1][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['call'].call_args_list[1][0][0])
 
   @patch("resource_management.core.shell.call")
   def test_rolling_restart_configure(self, call_mock):

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py 
b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py
index 31d54ae..f160029 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py
@@ -270,19 +270,8 @@ class TestOozieClient(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict = mocks_dict)
 
-    self.assertResourceCalled('Link', ('/etc/oozie/conf'), 
to='/usr/hdp/current/oozie-client/conf')
     self.assertResourceCalled('Execute',
                               ('ambari-python-wrap', '/usr/bin/hdp-select', 
'set', 'oozie-client', version), sudo=True)
     self.assertNoMoreResources()
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'oozie', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'oozie', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py 
b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
index 17b8abf..dfa22fd 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
@@ -1259,7 +1259,7 @@ class TestOozieServer(RMFTestCase):
      config_overrides = self.CONFIG_OVERRIDES,
      stack_version = self.UPGRADE_STACK_VERSION,
      target = RMFTestCase.TARGET_COMMON_SERVICES,
-     call_mocks = [(0, None, ''), (0, prepare_war_stdout)],
+     call_mocks = [(0, prepare_war_stdout)],
      mocks_dict = mocks_dict)
 
     self.assertTrue(isfile_mock.called)
@@ -1270,10 +1270,6 @@ class TestOozieServer(RMFTestCase):
     self.assertEqual(glob_mock.call_count,1)
     
glob_mock.assert_called_with('/usr/hdp/2.3.0.0-1234/hadoop/lib/hadoop-lzo*.jar')
 
-    self.assertResourceCalled('Link', '/etc/oozie/conf',
-                              to = '/usr/hdp/current/oozie-client/conf',
-    )
-
     self.assertResourceCalled('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'oozie-client', '2.3.0.0-1234'), sudo = True)
     self.assertResourceCalled('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'oozie-server', '2.3.0.0-1234'), sudo = True)
 
@@ -1284,17 +1280,6 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('File', 
'/usr/hdp/current/oozie-server/libext/ext-2.2.zip', mode = 0644)
     self.assertNoMoreResources()
 
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'oozie', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'oozie', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])
-
 
   @patch("os.path.isdir")
   @patch("os.path.exists")
@@ -1505,7 +1490,7 @@ class TestOozieServer(RMFTestCase):
      classname = "OozieServer", command = "pre_upgrade_restart", config_dict = 
json_content,
      stack_version = self.UPGRADE_STACK_VERSION,
      target = RMFTestCase.TARGET_COMMON_SERVICES,
-     call_mocks = [(0, None, ''), (0, prepare_war_stdout)],
+     call_mocks = [(0, prepare_war_stdout)],
      mocks_dict = mocks_dict)
 
     self.assertTrue(isfile_mock.called)
@@ -1516,7 +1501,6 @@ class TestOozieServer(RMFTestCase):
     self.assertEqual(glob_mock.call_count,1)
     
glob_mock.assert_called_with('/usr/hdp/2.3.0.0-1234/hadoop/lib/hadoop-lzo*.jar')
 
-    self.assertResourceCalled('Link', '/etc/oozie/conf', to = 
'/usr/hdp/current/oozie-client/conf')
     self.assertResourceCalled('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'oozie-client', '2.3.0.0-1234'), sudo = True)
     self.assertResourceCalled('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'oozie-server', '2.3.0.0-1234'), sudo = True)
 
@@ -1532,14 +1516,3 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('Execute', 'ambari-sudo.sh chown oozie:hadoop 
/usr/hdp/current/oozie-server/libext/falcon-oozie-el-extension-*.jar')
 
     self.assertNoMoreResources()
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'oozie', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'oozie', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py 
b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py
index 63076f9..3c4f899 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py
@@ -167,24 +167,8 @@ class TestPigClient(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None, '')],
                        mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier('Execute',
                               ('ambari-python-wrap', '/usr/bin/hdp-select', 
'set', 'hadoop-client', version), sudo=True)
     self.assertNoMoreResources()
-
-    self.assertEquals(2, mocks_dict['call'].call_count)
-    self.assertEquals(2, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'pig', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['checked_call'].call_args_list[1][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'pig', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['call'].call_args_list[1][0][0])

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py 
b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py
index 4622ae3..053d44a 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py
@@ -141,17 +141,6 @@ class TestSqoop(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict = mocks_dict)
 
-    self.assertResourceCalled('Link', ('/etc/sqoop/conf'), 
to='/usr/hdp/current/sqoop-client/conf')
     self.assertResourceCalled("Execute", ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'sqoop-client', version), sudo=True)
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'sqoop', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'sqoop', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py 
b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
index 0cfc6df..50b6583 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
@@ -794,6 +794,3 @@ class TestHistoryServer(RMFTestCase):
     )
 
     self.assertNoMoreResources()
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py 
b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py
index 5898355..75eff39 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py
@@ -416,21 +416,11 @@ class TestMapReduce2Client(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True)
     self.assertNoMoreResources()
 
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['call'].call_args_list[0][0][0])
-
   def test_stack_upgrade_save_new_config(self):
     config_file = 
self.get_src_folder()+"/test/python/stacks/2.0.6/configs/client-upgrade.json"
     with open(config_file, "r") as f:

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py 
b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
index d132e73..31e2e20 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
@@ -659,17 +659,7 @@ class TestNodeManager(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'hadoop-yarn-nodemanager', version), sudo=True)
     self.assertNoMoreResources()
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['call'].call_args_list[0][0][0])

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py 
b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
index 82d3a1c..7aa373f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
@@ -554,17 +554,7 @@ class TestResourceManager(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'hadoop-yarn-resourcemanager', version), 
sudo=True)
     self.assertNoMoreResources()
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['call'].call_args_list[0][0][0])

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py 
b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py
index 09a6278..375028a 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py
@@ -583,17 +583,7 @@ class TestYarnClient(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True)
     self.assertNoMoreResources()
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['call'].call_args_list[0][0][0])

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py 
b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
index f074036..4aa18de 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
@@ -197,19 +197,9 @@ class TestZookeeperClient(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier('Execute',
                               ('ambari-python-wrap', '/usr/bin/hdp-select', 
'set', 'zookeeper-client', version), sudo=True)
 
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'zookeeper', '--stack-version', '2.3.0.0-3242', '--conf-version', 
'0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'zookeeper', '--stack-version', '2.3.0.0-3242', '--conf-version', 
'0'),
-       mocks_dict['call'].call_args_list[0][0][0])
-
     self.assertNoMoreResources()

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py 
b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
index bc58e56..3cbfbd6 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
@@ -284,22 +284,10 @@ class TestZookeeperServer(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict = mocks_dict)
 
-    self.assertResourceCalledIgnoreEarlier('Link', ('/etc/zookeeper/conf'), 
to='/etc/zookeeper/conf.backup')
     self.assertResourceCalled('Execute',
                               ('ambari-python-wrap', '/usr/bin/hdp-select', 
'set', 'zookeeper-server', version), sudo=True)
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'zookeeper', '--stack-version', '2.3.0.0-3242', '--conf-version', 
'0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'zookeeper', '--stack-version', '2.3.0.0-3242', '--conf-version', 
'0'),
-       mocks_dict['call'].call_args_list[0][0][0])
-
     self.assertNoMoreResources()
 
   @patch.object(resource_management.libraries.functions, 
"get_unique_id_and_date")

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
index e32f1a2..805a7bc 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
@@ -19,14 +19,25 @@ limitations under the License.
 '''
 
 import json
-from mock.mock import MagicMock, call, patch
+from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
+from resource_management.core.logger import Logger
 from resource_management.libraries.functions import conf_select
+from resource_management.libraries.script import Script
 
 @patch("os.path.exists", new = MagicMock(return_value=True))
 class TestHookAfterInstall(RMFTestCase):
   CONFIG_OVERRIDES = {"serviceName":"HIVE", "role":"HIVE_SERVER"}
 
+  def setUp(self):
+    Logger.initialize_logger()
+
+    Script.config = dict()
+    Script.config.update( { "configurations" : { "cluster-env" : {} }, 
"hostLevelParams": {} } )
+    Script.config["configurations"]["cluster-env"]["stack_packages"] = 
RMFTestCase.get_stack_packages()
+    Script.config["hostLevelParams"] = { "stack_name" : "HDP" }
+
+
   def test_hook_default(self):
 
     self.executeScript("2.0.6/hooks/after-INSTALL/scripts/hook.py",

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py 
b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py
index dcc649d..9de2156 100644
--- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py
+++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py
@@ -126,18 +126,8 @@ class TestFalconClient(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier('Execute',
                               ('ambari-python-wrap', '/usr/bin/hdp-select', 
'set', 'falcon-client', version), sudo=True,)
     self.assertNoMoreResources()
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'falcon', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'falcon', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['call'].call_args_list[0][0][0])

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py 
b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
index a7e6a1e..2c877c8 100644
--- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
+++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
@@ -470,7 +470,6 @@ class TestFalconServer(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier('Execute',
@@ -487,12 +486,3 @@ class TestFalconServer(RMFTestCase):
         action = ['delete'],
     )
     self.assertNoMoreResources()
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'falcon', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'falcon', '--stack-version', '2.3.0.0-1234', '--conf-version', 
'0'),
-       mocks_dict['call'].call_args_list[0][0][0])

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py 
b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
index 796b107..24fb0d9 100644
--- a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
+++ b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
@@ -444,22 +444,12 @@ class TestHiveMetastore(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict = mocks_dict)
 
-    self.assertResourceCalled('Link', ('/etc/hive/conf'), 
to='/usr/hdp/current/hive-client/conf')
     self.assertResourceCalled('Execute',
                               ('ambari-python-wrap', '/usr/bin/hdp-select', 
'set', 'hive-metastore', version), sudo=True,)
     self.assertNoMoreResources()
 
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'hive', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'hive', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])
 
   def test_pre_upgrade_restart_ims(self):
     """
@@ -559,11 +549,8 @@ class TestHiveMetastore(RMFTestCase):
       config_overrides = self.CONFIG_OVERRIDES,
       stack_version = self.STACK_VERSION,
       target = RMFTestCase.TARGET_COMMON_SERVICES,
-      call_mocks = [(0, None, ''), (0, None)],
       mocks_dict = mocks_dict)
 
-    # conf-select, hdp-select BEFORE upgrade schema calls
-    self.assertResourceCalled('Link', ('/etc/hive/conf'), 
to='/usr/hdp/current/hive-client/conf')
     self.assertResourceCalled('Execute', ('ambari-python-wrap',
      '/usr/bin/hdp-select',
      'set',
@@ -716,11 +703,8 @@ class TestHiveMetastore(RMFTestCase):
                        config_overrides = self.CONFIG_OVERRIDES,
                        stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES,
-                       call_mocks = [(0, None, ''), (0, None)],
                        mocks_dict = mocks_dict)
 
-    self.assertResourceCalled('Link', ('/etc/hive/conf'), 
to='/usr/hdp/current/hive-client/conf')
-
     self.assertResourceCalled('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'hive-metastore', version), sudo=True,)
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py 
b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py
index 608b156..220b422 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py
@@ -167,16 +167,6 @@ class TestStormDrpcServer(TestStormBase):
                      config_overrides = self.CONFIG_OVERRIDES,
                      stack_version = self.STACK_VERSION,
                      target = RMFTestCase.TARGET_COMMON_SERVICES,
-                     call_mocks = [(0, None, ''), (0, None)],
                      mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier("Execute", ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'storm', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'storm', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py 
b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
index ab5da22..a2f2e5e 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
@@ -305,18 +305,7 @@ class TestStormNimbus(TestStormBase):
                      config_overrides = self.CONFIG_OVERRIDES,
                      stack_version = self.STACK_VERSION,
                      target = RMFTestCase.TARGET_COMMON_SERVICES,
-                     call_mocks = [(0, None, ''), (0, None)],
                      mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier("Execute", ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
     self.assertResourceCalled("Execute", ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'storm-nimbus', '2.3.0.0-1234'), sudo=True)
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'storm', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'storm', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])
-    self.assertNoMoreResources()

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py 
b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py
index efa50c8..df978b9 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py
@@ -141,18 +141,7 @@ class TestStormNimbus(TestStormBase):
                      config_overrides = self.CONFIG_OVERRIDES,
                      stack_version = self.STACK_VERSION,
                      target = RMFTestCase.TARGET_COMMON_SERVICES,
-                     call_mocks = [(0, None, ''), (0, None, '')],
                      mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier("Execute", ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
     self.assertResourceCalled("Execute", ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'storm-nimbus', '2.3.0.0-1234'), sudo=True)
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'storm', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'storm', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])
-    self.assertNoMoreResources()

http://git-wip-us.apache.org/repos/asf/ambari/blob/0535ca64/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py 
b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py
index 116597b..0232b45 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py
@@ -206,17 +206,7 @@ class TestStormSupervisor(TestStormBase):
                      config_overrides = self.CONFIG_OVERRIDES,
                      stack_version = self.STACK_VERSION,
                      target = RMFTestCase.TARGET_COMMON_SERVICES,
-                     call_mocks = [(0, None, ''), (0, None)],
                      mocks_dict = mocks_dict)
 
     self.assertResourceCalledIgnoreEarlier("Execute", ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
     self.assertResourceCalled("Execute", ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'storm-supervisor', '2.3.0.0-1234'), sudo=True)
-
-    self.assertEquals(1, mocks_dict['call'].call_count)
-    self.assertEquals(1, mocks_dict['checked_call'].call_count)
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'storm', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['checked_call'].call_args_list[0][0][0])
-    self.assertEquals(
-      ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'storm', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
-       mocks_dict['call'].call_args_list[0][0][0])

Reply via email to