You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2014/05/31 09:21:07 UTC

[03/12] AMBARI-5482. Integrate Ambari Shell. (Janos Matyas and Krisztian Horvath via yusaku)

http://git-wip-us.apache.org/repos/asf/ambari/blob/11dd9df8/ambari-client/src/test/python/json/ambariclient_get_config.json
----------------------------------------------------------------------
diff --git a/ambari-client/src/test/python/json/ambariclient_get_config.json b/ambari-client/src/test/python/json/ambariclient_get_config.json
deleted file mode 100644
index 55f35bc..0000000
--- a/ambari-client/src/test/python/json/ambariclient_get_config.json
+++ /dev/null
@@ -1,905 +0,0 @@
-{
-  "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations?fields=*",
-  "items" : [
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/datanode_du_reserved",
-      "StackConfigurations" : {
-        "property_description" : "Reserved space for HDFS",
-        "property_name" : "datanode_du_reserved",
-        "property_value" : "1",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.access.time.precision",
-      "StackConfigurations" : {
-        "property_description" : "The access time for HDFS file is precise upto this value.\n               The default value is 1 hour. Setting a value of 0 disables\n               access times for HDFS.\n  ",
-        "property_name" : "dfs.access.time.precision",
-        "property_value" : "0",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.balance.bandwidthPerSec",
-      "StackConfigurations" : {
-        "property_description" : "\n        Specifies the maximum amount of bandwidth that each datanode\n        can utilize for the balancing purpose in term of\n        the number of bytes per second.\n  ",
-        "property_name" : "dfs.balance.bandwidthPerSec",
-        "property_value" : "6250000",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.block.access.token.enable",
-      "StackConfigurations" : {
-        "property_description" : "\nIf \"true\", access tokens are used as capabilities for accessing datanodes.\nIf \"false\", no access tokens are checked on accessing datanodes.\n",
-        "property_name" : "dfs.block.access.token.enable",
-        "property_value" : "true",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.block.size",
-      "StackConfigurations" : {
-        "property_description" : "The default block size for new files.",
-        "property_name" : "dfs.block.size",
-        "property_value" : "134217728",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.blockreport.initialDelay",
-      "StackConfigurations" : {
-        "property_description" : "Delay for first block report in seconds.",
-        "property_name" : "dfs.blockreport.initialDelay",
-        "property_value" : "120",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.cluster.administrators",
-      "StackConfigurations" : {
-        "property_description" : "ACL for who all can view the default servlets in the HDFS",
-        "property_name" : "dfs.cluster.administrators",
-        "property_value" : " hdfs",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.datanode.du.pct",
-      "StackConfigurations" : {
-        "property_description" : "When calculating remaining space, only use this percentage of the real available space\n",
-        "property_name" : "dfs.datanode.du.pct",
-        "property_value" : "0.85f",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.datanode.failed.volumes.tolerated",
-      "StackConfigurations" : {
-        "property_description" : "Number of failed disks datanode would tolerate",
-        "property_name" : "dfs.datanode.failed.volumes.tolerated",
-        "property_value" : "0",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.datanode.ipc.address",
-      "StackConfigurations" : {
-        "property_description" : "\nThe datanode ipc server address and port.\nIf the port is 0 then the server will start on a free port.\n",
-        "property_name" : "dfs.datanode.ipc.address",
-        "property_value" : "0.0.0.0:8010",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.datanode.max.xcievers",
-      "StackConfigurations" : {
-        "property_description" : "PRIVATE CONFIG VARIABLE",
-        "property_name" : "dfs.datanode.max.xcievers",
-        "property_value" : "4096",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.datanode.socket.write.timeout",
-      "StackConfigurations" : {
-        "property_description" : "DFS Client write socket timeout",
-        "property_name" : "dfs.datanode.socket.write.timeout",
-        "property_value" : "0",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.heartbeat.interval",
-      "StackConfigurations" : {
-        "property_description" : "Determines datanode heartbeat interval in seconds.",
-        "property_name" : "dfs.heartbeat.interval",
-        "property_value" : "3",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.https.port",
-      "StackConfigurations" : {
-        "property_description" : "The https port where namenode binds",
-        "property_name" : "dfs.https.port",
-        "property_value" : "50470",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.namenode.avoid.read.stale.datanode",
-      "StackConfigurations" : {
-        "property_description" : "\n      Indicate whether or not to avoid reading from stale datanodes whose\n      heartbeat messages have not been received by the namenode for more than a\n      specified time interval.\n    ",
-        "property_name" : "dfs.namenode.avoid.read.stale.datanode",
-        "property_value" : "true",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.namenode.avoid.write.stale.datanode",
-      "StackConfigurations" : {
-        "property_description" : "\n      Indicate whether or not to avoid writing to stale datanodes whose\n      heartbeat messages have not been received by the namenode for more than a\n      specified time interval.\n    ",
-        "property_name" : "dfs.namenode.avoid.write.stale.datanode",
-        "property_value" : "true",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.namenode.handler.count",
-      "StackConfigurations" : {
-        "property_description" : "Added to grow Queue size so that more client connections are allowed",
-        "property_name" : "dfs.namenode.handler.count",
-        "property_value" : "100",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.namenode.handler.count",
-      "StackConfigurations" : {
-        "property_description" : "The number of server threads for the namenode.",
-        "property_name" : "dfs.namenode.handler.count",
-        "property_value" : "40",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.namenode.stale.datanode.interval",
-      "StackConfigurations" : {
-        "property_description" : "Datanode is stale after not getting a heartbeat in this interval in ms",
-        "property_name" : "dfs.namenode.stale.datanode.interval",
-        "property_value" : "30000",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.namenode.write.stale.datanode.ratio",
-      "StackConfigurations" : {
-        "property_description" : "When the ratio of number stale datanodes to total datanodes marked is greater\n      than this ratio, stop avoiding writing to stale nodes so as to prevent causing hotspots.\n    ",
-        "property_name" : "dfs.namenode.write.stale.datanode.ratio",
-        "property_value" : "1.0f",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.permissions",
-      "StackConfigurations" : {
-        "property_description" : "\nIf \"true\", enable permission checking in HDFS.\nIf \"false\", permission checking is turned off,\nbut all other behavior is unchanged.\nSwitching from one parameter value to the other does not change the mode,\nowner or group of files or directories.\n",
-        "property_name" : "dfs.permissions",
-        "property_value" : "true",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.permissions.supergroup",
-      "StackConfigurations" : {
-        "property_description" : "The name of the group of super-users.",
-        "property_name" : "dfs.permissions.supergroup",
-        "property_value" : "hdfs",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.replication.max",
-      "StackConfigurations" : {
-        "property_description" : "Maximal block replication.\n  ",
-        "property_name" : "dfs.replication.max",
-        "property_value" : "50",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.safemode.threshold.pct",
-      "StackConfigurations" : {
-        "property_description" : "\n        Specifies the percentage of blocks that should satisfy\n        the minimal replication requirement defined by dfs.replication.min.\n        Values less than or equal to 0 mean not to start in safe mode.\n        Values greater than 1 will make safe mode permanent.\n        ",
-        "property_name" : "dfs.safemode.threshold.pct",
-        "property_value" : "1.0f",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.secondary.https.port",
-      "StackConfigurations" : {
-        "property_description" : "The https port where secondary-namenode binds",
-        "property_name" : "dfs.secondary.https.port",
-        "property_value" : "50490",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.umaskmode",
-      "StackConfigurations" : {
-        "property_description" : "\nThe octal umask used when creating files and directories.\n",
-        "property_name" : "dfs.umaskmode",
-        "property_value" : "077",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs.web.ugi",
-      "StackConfigurations" : {
-        "property_description" : "The user account used by the web interface.\nSyntax: USERNAME,GROUP1,GROUP2, ...\n",
-        "property_name" : "dfs.web.ugi",
-        "property_value" : "gopher,gopher",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs_block_local_path_access_user",
-      "StackConfigurations" : {
-        "property_description" : "Default Block Replication.",
-        "property_name" : "dfs_block_local_path_access_user",
-        "property_value" : "hbase",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs_data_dir",
-      "StackConfigurations" : {
-        "property_description" : "Data directories for Data Nodes.",
-        "property_name" : "dfs_data_dir",
-        "property_value" : "/hadoop/hdfs/data",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs_datanode_address",
-      "StackConfigurations" : {
-        "property_description" : "Port for datanode address.",
-        "property_name" : "dfs_datanode_address",
-        "property_value" : "50010",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs_datanode_data_dir_perm",
-      "StackConfigurations" : {
-        "property_description" : "Datanode dir perms.",
-        "property_name" : "dfs_datanode_data_dir_perm",
-        "property_value" : "750",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs_datanode_failed_volume_tolerated",
-      "StackConfigurations" : {
-        "property_description" : "DataNode volumes failure toleration",
-        "property_name" : "dfs_datanode_failed_volume_tolerated",
-        "property_value" : "0",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs_datanode_http_address",
-      "StackConfigurations" : {
-        "property_description" : "Port for datanode address.",
-        "property_name" : "dfs_datanode_http_address",
-        "property_value" : "50075",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs_name_dir",
-      "StackConfigurations" : {
-        "property_description" : "NameNode Directories.",
-        "property_name" : "dfs_name_dir",
-        "property_value" : "/hadoop/hdfs/namenode",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs_replication",
-      "StackConfigurations" : {
-        "property_description" : "Default Block Replication.",
-        "property_name" : "dfs_replication",
-        "property_value" : "3",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dfs_webhdfs_enabled",
-      "StackConfigurations" : {
-        "property_description" : "WebHDFS enabled",
-        "property_name" : "dfs_webhdfs_enabled",
-        "property_value" : "true",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/dtnode_heapsize",
-      "StackConfigurations" : {
-        "property_description" : "DataNode maximum Java heap size",
-        "property_name" : "dtnode_heapsize",
-        "property_value" : "1024",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/fs.checkpoint.edits.dir",
-      "StackConfigurations" : {
-        "property_description" : "Determines where on the local filesystem the DFS secondary\n        name node should store the temporary edits to merge.\n        If this is a comma-delimited list of directoires then teh edits is\n        replicated in all of the directoires for redundancy.\n        Default value is same as fs.checkpoint.dir\n    ",
-        "property_name" : "fs.checkpoint.edits.dir",
-        "property_value" : "${fs.checkpoint.dir}",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "core-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/fs.checkpoint.period",
-      "StackConfigurations" : {
-        "property_description" : "The number of seconds between two periodic checkpoints.\n  ",
-        "property_name" : "fs.checkpoint.period",
-        "property_value" : "21600",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "core-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/fs.checkpoint.size",
-      "StackConfigurations" : {
-        "property_description" : "The size of the current edit log (in bytes) that triggers\n       a periodic checkpoint even if the fs.checkpoint.period hasn't expired.\n  ",
-        "property_name" : "fs.checkpoint.size",
-        "property_value" : "536870912",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "core-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/fs.trash.interval",
-      "StackConfigurations" : {
-        "property_description" : "Number of minutes between trash checkpoints.\n  If zero, the trash feature is disabled.\n  ",
-        "property_name" : "fs.trash.interval",
-        "property_value" : "360",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "core-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/fs_checkpoint_dir",
-      "StackConfigurations" : {
-        "property_description" : "Secondary NameNode checkpoint dir.",
-        "property_name" : "fs_checkpoint_dir",
-        "property_value" : "/hadoop/hdfs/namesecondary",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/fs_checkpoint_period",
-      "StackConfigurations" : {
-        "property_description" : "HDFS Maximum Checkpoint Delay",
-        "property_name" : "fs_checkpoint_period",
-        "property_value" : "21600",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/fs_checkpoint_size",
-      "StackConfigurations" : {
-        "property_description" : "FS Checkpoint Size.",
-        "property_name" : "fs_checkpoint_size",
-        "property_value" : "0.5",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/hadoop.security.authentication",
-      "StackConfigurations" : {
-        "property_description" : "\n   Set the authentication for the cluster. Valid values are: simple or\n   kerberos.\n   ",
-        "property_name" : "hadoop.security.authentication",
-        "property_value" : "simple",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "core-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/hadoop_heapsize",
-      "StackConfigurations" : {
-        "property_description" : "Hadoop maximum Java heap size",
-        "property_name" : "hadoop_heapsize",
-        "property_value" : "1024",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/hadoop_pid_dir_prefix",
-      "StackConfigurations" : {
-        "property_description" : "Hadoop PID Dir Prefix",
-        "property_name" : "hadoop_pid_dir_prefix",
-        "property_value" : "/var/run/hadoop",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/hdfs_log_dir_prefix",
-      "StackConfigurations" : {
-        "property_description" : "Hadoop Log Dir Prefix",
-        "property_name" : "hdfs_log_dir_prefix",
-        "property_value" : "/var/log/hadoop",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/hdfs_user",
-      "StackConfigurations" : {
-        "property_description" : "User and Groups.",
-        "property_name" : "hdfs_user",
-        "property_value" : "hdfs",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/io.compression.codec.lzo.class",
-      "StackConfigurations" : {
-        "property_description" : "The implementation for lzo codec.",
-        "property_name" : "io.compression.codec.lzo.class",
-        "property_value" : "com.hadoop.compression.lzo.LzoCodec",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "core-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/io.compression.codecs",
-      "StackConfigurations" : {
-        "property_description" : "A list of the compression codec classes that can be used\n                 for compression/decompression.",
-        "property_name" : "io.compression.codecs",
-        "property_value" : "org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec,com.hadoop.compression.lzo.LzoCodec,com.hadoop.compression.lzo.LzopCodec,org.apache.hadoop.io.compress.SnappyCodec",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "core-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/io.file.buffer.size",
-      "StackConfigurations" : {
-        "property_description" : "The size of buffer for use in sequence files.\n  The size of this buffer should probably be a multiple of hardware\n  page size (4096 on Intel x86), and it determines how much data is\n  buffered during read and write operations.",
-        "property_name" : "io.file.buffer.size",
-        "property_value" : "131072",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "core-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/io.serializations",
-      "StackConfigurations" : {
-        "property_description" : null,
-        "property_name" : "io.serializations",
-        "property_value" : "org.apache.hadoop.io.serializer.WritableSerialization",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "core-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/ipc.client.connect.max.retries",
-      "StackConfigurations" : {
-        "property_description" : "Defines the maximum number of retries for IPC connections.",
-        "property_name" : "ipc.client.connect.max.retries",
-        "property_value" : "50",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "core-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/ipc.client.connection.maxidletime",
-      "StackConfigurations" : {
-        "property_description" : "The maximum time after which a client will bring down the\n               connection to the server.\n  ",
-        "property_name" : "ipc.client.connection.maxidletime",
-        "property_value" : "30000",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "core-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/ipc.client.idlethreshold",
-      "StackConfigurations" : {
-        "property_description" : "Defines the threshold number of connections after which\n               connections will be inspected for idleness.\n  ",
-        "property_name" : "ipc.client.idlethreshold",
-        "property_value" : "8000",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "core-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/ipc.server.max.response.size",
-      "StackConfigurations" : {
-        "property_description" : null,
-        "property_name" : "ipc.server.max.response.size",
-        "property_value" : "5242880",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/ipc.server.read.threadpool.size",
-      "StackConfigurations" : {
-        "property_description" : null,
-        "property_name" : "ipc.server.read.threadpool.size",
-        "property_value" : "5",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hdfs-site.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/kerberos_domain",
-      "StackConfigurations" : {
-        "property_description" : "Kerberos realm.",
-        "property_name" : "kerberos_domain",
-        "property_value" : "EXAMPLE.COM",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/keytab_path",
-      "StackConfigurations" : {
-        "property_description" : "Kerberos keytab path.",
-        "property_name" : "keytab_path",
-        "property_value" : "/etc/security/keytabs",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/namenode_formatted_mark_dir",
-      "StackConfigurations" : {
-        "property_description" : "Formatteed Mark Directory.",
-        "property_name" : "namenode_formatted_mark_dir",
-        "property_value" : "/var/run/hadoop/hdfs/namenode/formatted/",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/namenode_heapsize",
-      "StackConfigurations" : {
-        "property_description" : "NameNode Java heap size",
-        "property_name" : "namenode_heapsize",
-        "property_value" : "1024",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/namenode_opt_maxnewsize",
-      "StackConfigurations" : {
-        "property_description" : "NameNode maximum new generation size",
-        "property_name" : "namenode_opt_maxnewsize",
-        "property_value" : "640",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/namenode_opt_newsize",
-      "StackConfigurations" : {
-        "property_description" : "NameNode new generation size",
-        "property_name" : "namenode_opt_newsize",
-        "property_value" : "200",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/proxyuser_group",
-      "StackConfigurations" : {
-        "property_description" : "Proxy user group.",
-        "property_name" : "proxyuser_group",
-        "property_value" : "users",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/security.client.datanode.protocol.acl",
-      "StackConfigurations" : {
-        "property_description" : "ACL for ClientDatanodeProtocol, the client-to-datanode protocol\n    for block recovery.\n    The ACL is a comma-separated list of user and group names. The user and\n    group list is separated by a blank. For e.g. \"alice,bob users,wheel\".\n    A special value of \"*\" means all users are allowed.",
-        "property_name" : "security.client.datanode.protocol.acl",
-        "property_value" : "*",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hadoop-policy.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/security.client.protocol.acl",
-      "StackConfigurations" : {
-        "property_description" : "ACL for ClientProtocol, which is used by user code\n    via the DistributedFileSystem.\n    The ACL is a comma-separated list of user and group names. The user and\n    group list is separated by a blank. For e.g. \"alice,bob users,wheel\".\n    A special value of \"*\" means all users are allowed.",
-        "property_name" : "security.client.protocol.acl",
-        "property_value" : "*",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hadoop-policy.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/security.datanode.protocol.acl",
-      "StackConfigurations" : {
-        "property_description" : "ACL for DatanodeProtocol, which is used by datanodes to\n    communicate with the namenode.\n    The ACL is a comma-separated list of user and group names. The user and\n    group list is separated by a blank. For e.g. \"alice,bob users,wheel\".\n    A special value of \"*\" means all users are allowed.",
-        "property_name" : "security.datanode.protocol.acl",
-        "property_value" : "*",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hadoop-policy.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/security.inter.datanode.protocol.acl",
-      "StackConfigurations" : {
-        "property_description" : "ACL for InterDatanodeProtocol, the inter-datanode protocol\n    for updating generation timestamp.\n    The ACL is a comma-separated list of user and group names. The user and\n    group list is separated by a blank. For e.g. \"alice,bob users,wheel\".\n    A special value of \"*\" means all users are allowed.",
-        "property_name" : "security.inter.datanode.protocol.acl",
-        "property_value" : "*",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hadoop-policy.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/security.inter.tracker.protocol.acl",
-      "StackConfigurations" : {
-        "property_description" : "ACL for InterTrackerProtocol, used by the tasktrackers to\n    communicate with the jobtracker.\n    The ACL is a comma-separated list of user and group names. The user and\n    group list is separated by a blank. For e.g. \"alice,bob users,wheel\".\n    A special value of \"*\" means all users are allowed.",
-        "property_name" : "security.inter.tracker.protocol.acl",
-        "property_value" : "*",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hadoop-policy.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/security.job.submission.protocol.acl",
-      "StackConfigurations" : {
-        "property_description" : "ACL for JobSubmissionProtocol, used by job clients to\n    communciate with the jobtracker for job submission, querying job status etc.\n    The ACL is a comma-separated list of user and group names. The user and\n    group list is separated by a blank. For e.g. \"alice,bob users,wheel\".\n    A special value of \"*\" means all users are allowed.",
-        "property_name" : "security.job.submission.protocol.acl",
-        "property_value" : "*",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hadoop-policy.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/security.namenode.protocol.acl",
-      "StackConfigurations" : {
-        "property_description" : "ACL for NamenodeProtocol, the protocol used by the secondary\n    namenode to communicate with the namenode.\n    The ACL is a comma-separated list of user and group names. The user and\n    group list is separated by a blank. For e.g. \"alice,bob users,wheel\".\n    A special value of \"*\" means all users are allowed.",
-        "property_name" : "security.namenode.protocol.acl",
-        "property_value" : "*",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hadoop-policy.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/security.task.umbilical.protocol.acl",
-      "StackConfigurations" : {
-        "property_description" : "ACL for TaskUmbilicalProtocol, used by the map and reduce\n    tasks to communicate with the parent tasktracker.\n    The ACL is a comma-separated list of user and group names. The user and\n    group list is separated by a blank. For e.g. \"alice,bob users,wheel\".\n    A special value of \"*\" means all users are allowed.",
-        "property_name" : "security.task.umbilical.protocol.acl",
-        "property_value" : "*",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "hadoop-policy.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/security_enabled",
-      "StackConfigurations" : {
-        "property_description" : "Hadoop Security",
-        "property_name" : "security_enabled",
-        "property_value" : "false",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS/configurations/webinterface.private.actions",
-      "StackConfigurations" : {
-        "property_description" : " If set to true, the web interfaces of JT and NN may contain\n                actions, such as kill job, delete file, etc., that should\n                not be exposed to public. Enable this option if the interfaces\n                are only reachable by those who have the right authorization.\n  ",
-        "property_name" : "webinterface.private.actions",
-        "property_value" : "false",
-        "service_name" : "HDFS",
-        "stack_name" : "HDP",
-        "stack_version" : "1.3.0",
-        "type" : "core-site.xml"
-      }
-    }
-  ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/11dd9df8/ambari-client/src/test/python/json/ambariclient_get_host.json
----------------------------------------------------------------------
diff --git a/ambari-client/src/test/python/json/ambariclient_get_host.json b/ambari-client/src/test/python/json/ambariclient_get_host.json
deleted file mode 100644
index d710626..0000000
--- a/ambari-client/src/test/python/json/ambariclient_get_host.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "href" : "http://localhost:8080/api/v1/hosts/dev06.hortonworks.com",
-  "Hosts" : {
-    "cpu_count" : 4,
-    "desired_configs" : null,
-    "disk_info" : [
-      {
-        "available" : "45333752",
-        "used" : "5748252",
-        "percent" : "12%",
-        "size" : "51606140",
-        "type" : "ext4",
-        "mountpoint" : "/"
-      },
-      {
-        "available" : "5517976",
-        "used" : "272",
-        "percent" : "1%",
-        "size" : "5518248",
-        "type" : "tmpfs",
-        "mountpoint" : "/dev/shm"
-      },
-      {
-        "available" : "432210",
-        "used" : "38034",
-        "percent" : "9%",
-        "size" : "495844",
-        "type" : "ext4",
-        "mountpoint" : "/boot"
-      },
-      {
-        "available" : "44459840",
-        "used" : "184252",
-        "percent" : "1%",
-        "size" : "47033288",
-        "type" : "ext4",
-        "mountpoint" : "/home"
-      },
-      {
-        "available" : "136400692",
-        "used" : "840256712",
-        "percent" : "87%",
-        "size" : "976657404",
-        "type" : "vboxsf",
-        "mountpoint" : "/media/sf_share"
-      }
-    ],
-    "host_health_report" : "",
-    "host_name" : "dev06.hortonworks.com",
-    "host_state" : "HEARTBEAT_LOST",
-    "host_status" : "UNKNOWN",
-    "ip" : "10.0.2.15",
-    "last_agent_env" : null,
-    "last_heartbeat_time" : 0,
-    "last_registration_time" : 1378228232506,
-    "os_arch" : "x86_64",
-    "os_type" : "centos6",
-    "ph_cpu_count" : 1,
-    "public_host_name" : "dev06.hortonworks.com",
-    "rack_info" : "/default-rack",
-    "total_mem" : 11041505
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/11dd9df8/ambari-client/src/test/python/json/clustermodel_error_deleting_host.json
----------------------------------------------------------------------
diff --git a/ambari-client/src/test/python/json/clustermodel_error_deleting_host.json b/ambari-client/src/test/python/json/clustermodel_error_deleting_host.json
deleted file mode 100644
index 06d1bc9..0000000
--- a/ambari-client/src/test/python/json/clustermodel_error_deleting_host.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "status" : 400,
-  "message" : "Attempted to add unknown hosts to a cluster.  These hosts have not been registered with the server: dev05"
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/11dd9df8/ambari-client/src/test/python/json/clustermodel_get_all_hosts.json
----------------------------------------------------------------------
diff --git a/ambari-client/src/test/python/json/clustermodel_get_all_hosts.json b/ambari-client/src/test/python/json/clustermodel_get_all_hosts.json
deleted file mode 100644
index 614f8d4..0000000
--- a/ambari-client/src/test/python/json/clustermodel_get_all_hosts.json
+++ /dev/null
@@ -1,375 +0,0 @@
-{
-  "href" : "http://localhost:8080/api/v1/clusters/test1/hosts?fields=*",
-  "items" : [
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/hosts/dev05.hortonworks.com",
-      "Hosts" : {
-        "cluster_name" : "test1",
-        "cpu_count" : 4,
-        "disk_info" : [
-          {
-            "available" : "43515968",
-            "used" : "7566036",
-            "percent" : "15%",
-            "size" : "51606140",
-            "type" : "ext4",
-            "mountpoint" : "/"
-          },
-          {
-            "available" : "5517988",
-            "used" : "260",
-            "percent" : "1%",
-            "size" : "5518248",
-            "type" : "tmpfs",
-            "mountpoint" : "/dev/shm"
-          },
-          {
-            "available" : "432210",
-            "used" : "38034",
-            "percent" : "9%",
-            "size" : "495844",
-            "type" : "ext4",
-            "mountpoint" : "/boot"
-          },
-          {
-            "available" : "44459872",
-            "used" : "184220",
-            "percent" : "1%",
-            "size" : "47033288",
-            "type" : "ext4",
-            "mountpoint" : "/home"
-          },
-          {
-            "available" : "57923596",
-            "used" : "918733808",
-            "percent" : "95%",
-            "size" : "976657404",
-            "type" : "vboxsf",
-            "mountpoint" : "/media/sf_share"
-          }
-        ],
-        "host_health_report" : "",
-        "host_name" : "dev05.hortonworks.com",
-        "host_state" : "HEALTHY",
-        "host_status" : "HEALTHY",
-        "ip" : "10.0.2.15",
-        "last_agent_env" : {
-          "stackFoldersAndFiles" : [
-            {
-              "name" : "/etc/hadoop",
-              "type" : "directory"
-            },
-            {
-              "name" : "/etc/hbase",
-              "type" : "directory"
-            },
-            {
-              "name" : "/etc/hcatalog",
-              "type" : "directory"
-            },
-            {
-              "name" : "/etc/hive",
-              "type" : "directory"
-            },
-            {
-              "name" : "/etc/ganglia",
-              "type" : "directory"
-            },
-            {
-              "name" : "/etc/nagios",
-              "type" : "directory"
-            },
-            {
-              "name" : "/etc/oozie",
-              "type" : "directory"
-            },
-            {
-              "name" : "/etc/zookeeper",
-              "type" : "directory"
-            },
-            {
-              "name" : "/var/run/hive",
-              "type" : "directory"
-            },
-            {
-              "name" : "/var/run/hadoop-hdfs",
-              "type" : "directory"
-            },
-            {
-              "name" : "/var/run/hadoop-yarn",
-              "type" : "directory"
-            },
-            {
-              "name" : "/var/run/hadoop-mapreduce",
-              "type" : "directory"
-            },
-            {
-              "name" : "/var/log/hbase",
-              "type" : "directory"
-            },
-            {
-              "name" : "/var/log/hive",
-              "type" : "directory"
-            },
-            {
-              "name" : "/var/log/oozie",
-              "type" : "directory"
-            },
-            {
-              "name" : "/var/log/zookeeper",
-              "type" : "directory"
-            },
-            {
-              "name" : "/var/log/hadoop-hdfs",
-              "type" : "directory"
-            },
-            {
-              "name" : "/var/log/hadoop-yarn",
-              "type" : "directory"
-            },
-            {
-              "name" : "/var/log/hadoop-mapreduce",
-              "type" : "directory"
-            },
-            {
-              "name" : "/usr/lib/hadoop",
-              "type" : "directory"
-            },
-            {
-              "name" : "/usr/lib/hbase",
-              "type" : "directory"
-            },
-            {
-              "name" : "/usr/lib/hive",
-              "type" : "directory"
-            },
-            {
-              "name" : "/usr/lib/nagios",
-              "type" : "directory"
-            },
-            {
-              "name" : "/usr/lib/oozie",
-              "type" : "directory"
-            },
-            {
-              "name" : "/usr/lib/zookeeper",
-              "type" : "directory"
-            },
-            {
-              "name" : "/usr/lib/hadoop-hdfs",
-              "type" : "directory"
-            },
-            {
-              "name" : "/usr/lib/hadoop-yarn",
-              "type" : "directory"
-            },
-            {
-              "name" : "/usr/lib/hadoop-mapreduce",
-              "type" : "directory"
-            },
-            {
-              "name" : "/var/lib/ganglia",
-              "type" : "directory"
-            },
-            {
-              "name" : "/var/lib/oozie",
-              "type" : "directory"
-            },
-            {
-              "name" : "/var/lib/zookeeper",
-              "type" : "directory"
-            }
-          ],
-          "rpms" : [ ],
-          "alternatives" : [
-            {
-              "name" : "hcatalog-conf",
-              "target" : "/etc/hcatalog/conf.dist"
-            },
-            {
-              "name" : "zookeeper-conf",
-              "target" : "/etc/zookeeper/conf.dist"
-            },
-            {
-              "name" : "hadoop-conf",
-              "target" : "/etc/hadoop/conf.empty"
-            },
-            {
-              "name" : "hbase-conf",
-              "target" : "/etc/hbase/conf.dist"
-            },
-            {
-              "name" : "hive-conf",
-              "target" : "/etc/hive/conf.dist"
-            },
-            {
-              "name" : "oozie-conf",
-              "target" : "/etc/oozie/conf.dist"
-            }
-          ],
-          "existingUsers" : [
-            {
-              "userName" : "rrdcached",
-              "userHomeDir" : "/var/rrdtool/rrdcached",
-              "userStatus" : "Available"
-            },
-            {
-              "userName" : "zookeeper",
-              "userHomeDir" : "/var/run/zookeeper",
-              "userStatus" : "Available"
-            },
-            {
-              "userName" : "hdfs",
-              "userHomeDir" : "/var/lib/hadoop-hdfs",
-              "userStatus" : "Available"
-            },
-            {
-              "userName" : "hbase",
-              "userHomeDir" : "/var/run/hbase",
-              "userStatus" : "Available"
-            },
-            {
-              "userName" : "yarn",
-              "userHomeDir" : "/var/lib/hadoop-yarn",
-              "userStatus" : "Available"
-            },
-            {
-              "userName" : "mapred",
-              "userHomeDir" : "/var/lib/hadoop-mapreduce",
-              "userStatus" : "Available"
-            },
-            {
-              "userName" : "hive",
-              "userHomeDir" : "/var/lib/hive",
-              "userStatus" : "Available"
-            },
-            {
-              "userName" : "hcat",
-              "userHomeDir" : "/usr/lib/hcatalog",
-              "userStatus" : "Available"
-            },
-            {
-              "userName" : "oozie",
-              "userHomeDir" : "/var/run/oozie",
-              "userStatus" : "Available"
-            },
-            {
-              "userName" : "nagios",
-              "userHomeDir" : "/var/log/nagios",
-              "userStatus" : "Available"
-            }
-          ],
-          "existingRepos" : [
-            "HDP-2.0.5"
-          ],
-          "installedPackages" : [ ],
-          "hostHealth" : {
-            "activeJavaProcs" : [
-              {
-                "user" : "root",
-                "pid" : 2716,
-                "command" : "/usr/bin/java -Dosgi.requiredJavaVersion=1.6 -XX:MaxPermSize=256m -Xms40m -Xmx512m -jar /usr/lib/eclipse//plugins/org.eclipse.equinox.launcher_1.3.0.v20130327-1440.jar -os linux -ws gtk -arch x86_64 -showsplash /usr/lib/eclipse//plugins/org.eclipse.platform_4.3.0.v20130605-2000/splash.bmp -launcher /usr/lib/eclipse/eclipse -name Eclipse --launcher.library /usr/lib/eclipse//plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.200.v20130521-0416/eclipse_1506.so -startup /usr/lib/eclipse//plugins/org.eclipse.equinox.launcher_1.3.0.v20130327-1440.jar --launcher.appendVmargs -exitdata 8000d -product org.eclipse.epp.package.jee.product -vm /usr/bin/java -vmargs -Dosgi.requiredJavaVersion=1.6 -XX:MaxPermSize=256m -Xms40m -Xmx512m -jar /usr/lib/eclipse//plugins/org.eclipse.equinox.launcher_1.3.0.v20130327-1440.jar",
-                "hadoop" : false
-              }
-            ],
-            "agentTimeStampAtReporting" : 1379683509805,
-            "serverTimeStampAtReporting" : 1379683509851,
-            "liveServices" : [
-              {
-                "name" : "ntpd",
-                "desc" : "",
-                "status" : "Healthy"
-              }
-            ],
-            "diskStatus" : [
-              {
-                "available" : "43516404",
-                "used" : "7565600",
-                "percent" : "15%",
-                "size" : "51606140",
-                "type" : "ext4",
-                "mountpoint" : "/"
-              }
-            ]
-          },
-          "umask" : 18
-        },
-        "last_heartbeat_time" : 1379683560126,
-        "last_registration_time" : 1379683395402,
-        "os_arch" : "x86_64",
-        "os_type" : "centos6",
-        "ph_cpu_count" : 1,
-        "public_host_name" : "dev05.hortonworks.com",
-        "rack_info" : "/default-rack",
-        "total_mem" : 11041505,
-        "desired_configs" : { }
-      },
-      "host_components" : [ ]
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/hosts/dev06.hortonworks.com",
-      "Hosts" : {
-        "cluster_name" : "test1",
-        "cpu_count" : 4,
-        "disk_info" : [
-          {
-            "available" : "45333752",
-            "used" : "5748252",
-            "percent" : "12%",
-            "size" : "51606140",
-            "type" : "ext4",
-            "mountpoint" : "/"
-          },
-          {
-            "available" : "5517976",
-            "used" : "272",
-            "percent" : "1%",
-            "size" : "5518248",
-            "type" : "tmpfs",
-            "mountpoint" : "/dev/shm"
-          },
-          {
-            "available" : "432210",
-            "used" : "38034",
-            "percent" : "9%",
-            "size" : "495844",
-            "type" : "ext4",
-            "mountpoint" : "/boot"
-          },
-          {
-            "available" : "44459840",
-            "used" : "184252",
-            "percent" : "1%",
-            "size" : "47033288",
-            "type" : "ext4",
-            "mountpoint" : "/home"
-          },
-          {
-            "available" : "136400692",
-            "used" : "840256712",
-            "percent" : "87%",
-            "size" : "976657404",
-            "type" : "vboxsf",
-            "mountpoint" : "/media/sf_share"
-          }
-        ],
-        "host_health_report" : "",
-        "host_name" : "dev06.hortonworks.com",
-        "host_state" : "HEARTBEAT_LOST",
-        "host_status" : "UNKNOWN",
-        "ip" : "10.0.2.15",
-        "last_agent_env" : null,
-        "last_heartbeat_time" : 0,
-        "last_registration_time" : 1378228232506,
-        "os_arch" : "x86_64",
-        "os_type" : "centos6",
-        "ph_cpu_count" : 1,
-        "public_host_name" : "dev06.hortonworks.com",
-        "rack_info" : "/default-rack",
-        "total_mem" : 11041505,
-        "desired_configs" : { }
-      },
-      "host_components" : [ ]
-    }
-  ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/11dd9df8/ambari-client/src/test/python/json/clustermodel_get_all_services.json
----------------------------------------------------------------------
diff --git a/ambari-client/src/test/python/json/clustermodel_get_all_services.json b/ambari-client/src/test/python/json/clustermodel_get_all_services.json
deleted file mode 100644
index 53bb2da..0000000
--- a/ambari-client/src/test/python/json/clustermodel_get_all_services.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "href" : "http://localhost:8080/api/v1/clusters/test1/services?fields=*",
-  "items" : [
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/services/GANGLIA",
-      "ServiceInfo" : {
-        "cluster_name" : "test1",
-        "state" : "STARTED",
-        "service_name" : "GANGLIA",
-        "desired_configs" : {
-          "global" : "version1"
-        }
-      },
-      "components" : [
-        {
-          "href" : "http://localhost:8080/api/v1/clusters/test1/services/GANGLIA/components/GANGLIA_MONITOR",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "test1",
-            "component_name" : "GANGLIA_MONITOR",
-            "service_name" : "GANGLIA"
-          }
-        },
-        {
-          "href" : "http://localhost:8080/api/v1/clusters/test1/services/GANGLIA/components/GANGLIA_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "test1",
-            "component_name" : "GANGLIA_SERVER",
-            "service_name" : "GANGLIA"
-          }
-        }
-      ]
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/services/MAPREDUCE",
-      "ServiceInfo" : {
-        "cluster_name" : "test1",
-        "state" : "STARTED",
-        "service_name" : "MAPREDUCE",
-        "desired_configs" : {
-          "mapred-site" : "version1",
-          "global" : "version1",
-          "core-site" : "version1"
-        }
-      },
-      "components" : [
-        {
-          "href" : "http://localhost:8080/api/v1/clusters/test1/services/MAPREDUCE/components/TASKTRACKER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "test1",
-            "component_name" : "TASKTRACKER",
-            "service_name" : "MAPREDUCE"
-          }
-        },
-        {
-          "href" : "http://localhost:8080/api/v1/clusters/test1/services/MAPREDUCE/components/MAPREDUCE_CLIENT",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "test1",
-            "component_name" : "MAPREDUCE_CLIENT",
-            "service_name" : "MAPREDUCE"
-          }
-        },
-        {
-          "href" : "http://localhost:8080/api/v1/clusters/test1/services/MAPREDUCE/components/JOBTRACKER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "test1",
-            "component_name" : "JOBTRACKER",
-            "service_name" : "MAPREDUCE"
-          }
-        }
-      ]
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/services/HDFS",
-      "ServiceInfo" : {
-        "cluster_name" : "test1",
-        "state" : "STARTED",
-        "service_name" : "HDFS",
-        "desired_configs" : {
-          "global" : "version1",
-          "hdfs-site" : "version1",
-          "core-site" : "version1"
-        }
-      },
-      "components" : [
-        {
-          "href" : "http://localhost:8080/api/v1/clusters/test1/services/HDFS/components/SECONDARY_NAMENODE",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "test1",
-            "component_name" : "SECONDARY_NAMENODE",
-            "service_name" : "HDFS"
-          }
-        },
-        {
-          "href" : "http://localhost:8080/api/v1/clusters/test1/services/HDFS/components/HDFS_CLIENT",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "test1",
-            "component_name" : "HDFS_CLIENT",
-            "service_name" : "HDFS"
-          }
-        },
-        {
-          "href" : "http://localhost:8080/api/v1/clusters/test1/services/HDFS/components/NAMENODE",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "test1",
-            "component_name" : "NAMENODE",
-            "service_name" : "HDFS"
-          }
-        },
-        {
-          "href" : "http://localhost:8080/api/v1/clusters/test1/services/HDFS/components/DATANODE",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "test1",
-            "component_name" : "DATANODE",
-            "service_name" : "HDFS"
-          }
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/11dd9df8/ambari-client/src/test/python/json/clustermodel_get_cluster.json
----------------------------------------------------------------------
diff --git a/ambari-client/src/test/python/json/clustermodel_get_cluster.json b/ambari-client/src/test/python/json/clustermodel_get_cluster.json
deleted file mode 100644
index 4c72dea..0000000
--- a/ambari-client/src/test/python/json/clustermodel_get_cluster.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "href" : "http://localhost:8080/api/v1/clusters/test1",
-  "Clusters" : {
-    "cluster_name" : "test1",
-    "cluster_id" : 1,
-    "version" : "HDP-1.2.1"
-  },
-  "requests" : [ ],
-  "services" : [
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/services/GANGLIA",
-      "ServiceInfo" : {
-        "cluster_name" : "test1",
-        "service_name" : "GANGLIA"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/services/MAPREDUCE",
-      "ServiceInfo" : {
-        "cluster_name" : "test1",
-        "service_name" : "MAPREDUCE"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/services/HDFS",
-      "ServiceInfo" : {
-        "cluster_name" : "test1",
-        "service_name" : "HDFS"
-      }
-    }
-  ],
-  "hosts" : [
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/hosts/r01mgt",
-      "Hosts" : {
-        "cluster_name" : "test1",
-        "host_name" : "r01mgt"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/hosts/r01hn01",
-      "Hosts" : {
-        "cluster_name" : "test1",
-        "host_name" : "r01hn01"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/hosts/r01wn03",
-      "Hosts" : {
-        "cluster_name" : "test1",
-        "host_name" : "r01wn03"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/hosts/r01wn02",
-      "Hosts" : {
-        "cluster_name" : "test1",
-        "host_name" : "r01wn02"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/hosts/r01wn01",
-      "Hosts" : {
-        "cluster_name" : "test1",
-        "host_name" : "r01wn01"
-      }
-    }
-  ],
-  "configurations" : [
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/configurations?type=mapred-site&tag=version1",
-      "tag" : "version1",
-      "type" : "mapred-site",
-      "Config" : {
-        "cluster_name" : "test1"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/configurations?type=global&tag=version1",
-      "tag" : "version1",
-      "type" : "global",
-      "Config" : {
-        "cluster_name" : "test1"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/configurations?type=hdfs-site&tag=version1",
-      "tag" : "version1",
-      "type" : "hdfs-site",
-      "Config" : {
-        "cluster_name" : "test1"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/configurations?type=core-site&tag=version1",
-      "tag" : "version1",
-      "type" : "core-site",
-      "Config" : {
-        "cluster_name" : "test1"
-      }
-    }
-  ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/11dd9df8/ambari-client/src/test/python/json/clustermodel_get_core_site_config.json
----------------------------------------------------------------------
diff --git a/ambari-client/src/test/python/json/clustermodel_get_core_site_config.json b/ambari-client/src/test/python/json/clustermodel_get_core_site_config.json
deleted file mode 100644
index 309ba13..0000000
--- a/ambari-client/src/test/python/json/clustermodel_get_core_site_config.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "href" : "http://localhost:8080/api/v1/clusters/test1/configurations?type=core-site&tag=version1",
-  "items" : [
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/configurations?type=core-site&tag=version1",
-      "tag" : "version1",
-      "type" : "core-site",
-      "Config" : {
-        "cluster_name" : "test1"
-      },
-      "properties" : {
-        "dfs.namenode.checkpoint.dir" : "/hadoop/hdfs/namesecondary",
-        "dfs.namenode.checkpoint.edits.dir" : "${dfs.namenode.checkpoint.dir}",
-        "dfs.namenode.checkpoint.period" : "21600",
-        "fs.checkpoint.edits.dir" : "/hadoop/hdfs/namesecondary",
-        "fs.checkpoint.size" : "0.5",
-        "fs.defaultFS" : "hdfs://dev05.hortonworks.com:8020",
-        "fs.trash.interval" : "360",
-        "hadoop.security.auth_to_local" : "\n        RULE:[2:$1@$0]([rn]m@.*)s/.*/yarn/\n        RULE:[2:$1@$0](jhs@.*)s/.*/mapred/\n        RULE:[2:$1@$0]([nd]n@.*)s/.*/hdfs/\n        RULE:[2:$1@$0](hm@.*)s/.*/hbase/\n        RULE:[2:$1@$0](rs@.*)s/.*/hbase/\n        DEFAULT\n    ",
-        "hadoop.security.authentication" : "simple",
-        "hadoop.security.authorization" : "false",
-        "io.compression.codecs" : "org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec",
-        "io.file.buffer.size" : "131072",
-        "io.serializations" : "org.apache.hadoop.io.serializer.WritableSerialization",
-        "ipc.client.connect.max.retries" : "50",
-        "ipc.client.connection.maxidletime" : "30000",
-        "ipc.client.idlethreshold" : "8000",
-        "mapreduce.jobtracker.webinterface.trusted" : "false"
-      }
-    }
-  ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/11dd9df8/ambari-client/src/test/python/json/clustermodel_get_global_config.json
----------------------------------------------------------------------
diff --git a/ambari-client/src/test/python/json/clustermodel_get_global_config.json b/ambari-client/src/test/python/json/clustermodel_get_global_config.json
deleted file mode 100644
index 2b7888d..0000000
--- a/ambari-client/src/test/python/json/clustermodel_get_global_config.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "href" : "http://localhost:8080/api/v1/clusters/test1/configurations?type=global&tag=version1",
-  "items" : [
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/configurations?type=global&tag=version1",
-      "tag" : "version1",
-      "type" : "global",
-      "Config" : {
-        "cluster_name" : "test1"
-      },
-      "properties" : {
-        "apache_artifacts_download_url" : "",
-        "datanode_du_reserved" : "1",
-        "dfs_block_local_path_access_user" : "hbase",
-        "dfs_datanode_address" : "50010",
-        "dfs_datanode_data_dir" : "/hadoop/hdfs/data",
-        "dfs_datanode_data_dir_perm" : "750",
-        "dfs_datanode_failed_volume_tolerated" : "0",
-        "dfs_datanode_http_address" : "50075",
-        "dfs_exclude" : "dfs.exclude",
-        "dfs_namenode_checkpoint_dir" : "/hadoop/hdfs/namesecondary",
-        "dfs_namenode_checkpoint_period" : "21600",
-        "dfs_namenode_name_dir" : "/hadoop/hdfs/namenode",
-        "dfs_replication" : "3",
-        "dfs_webhdfs_enabled" : "true",
-        "dtnode_heapsize" : "1024m",
-        "fs_checkpoint_size" : "0.5",
-        "ganglia_runtime_dir" : "/var/run/ganglia/hdp",
-        "gmetad_user" : "nobody",
-        "gmond_user" : "nobody",
-        "gpl_artifacts_download_url" : "",
-        "hadoop_conf_dir" : "/etc/hadoop/conf",
-        "hadoop_heapsize" : "1024",
-        "hadoop_pid_dir_prefix" : "/var/run/hadoop",
-        "hbase_conf_dir" : "/etc/hbase",
-        "hbase_user" : "hbase",
-        "hcat_conf_dir" : "",
-        "hcat_user" : "hcat",
-        "hdfs_enable_shortcircuit_read" : "true",
-        "hdfs_log_dir_prefix" : "/var/log/hadoop",
-        "hdfs_user" : "hdfs",
-        "hive_user" : "hive",
-        "java64_home" : "/usr/jdk/jdk1.6.0_31",
-        "mapred_user" : "mapred",
-        "nagios_group" : "nagios",
-        "nagios_user" : "nagios",
-        "namenode_formatted_mark_dir" : "/var/run/hadoop/hdfs/namenode/formatted/",
-        "namenode_heapsize" : "1024m",
-        "namenode_opt_maxnewsize" : "640m",
-        "namenode_opt_newsize" : "200m",
-        "oozie_user" : "oozie",
-        "proxyuser_group" : "users",
-        "rrdcached_base_dir" : "/var/lib/ganglia/rrds",
-        "run_dir" : "/var/run/hadoop",
-        "security_enabled" : "false",
-        "smokeuser" : "ambari-qa",
-        "user_group" : "hadoop",
-        "webhcat_user" : "hcat",
-        "yarn_user" : "yarn",
-        "zk_user" : "zookeeper"
-      }
-    }
-  ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/11dd9df8/ambari-client/src/test/python/json/clustermodel_get_hdfs_site_config.json
----------------------------------------------------------------------
diff --git a/ambari-client/src/test/python/json/clustermodel_get_hdfs_site_config.json b/ambari-client/src/test/python/json/clustermodel_get_hdfs_site_config.json
deleted file mode 100644
index 9108aa7..0000000
--- a/ambari-client/src/test/python/json/clustermodel_get_hdfs_site_config.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "href" : "http://localhost:8080/api/v1/clusters/test1/configurations?type=hdfs-site&tag=version1",
-  "items" : [
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/configurations?type=hdfs-site&tag=version1",
-      "tag" : "version1",
-      "type" : "hdfs-site",
-      "Config" : {
-        "cluster_name" : "test1"
-      },
-      "properties" : {
-        "dfs.block.access.token.enable" : "true",
-        "dfs.block.local-path-access.user" : "hbase",
-        "dfs.blockreport.initialDelay" : "120",
-        "dfs.blocksize" : "134217728",
-        "dfs.client.read.shortcircuit" : "true",
-        "dfs.client.read.shortcircuit.streams.cache.size" : "4096",
-        "dfs.cluster.administrators" : " hdfs",
-        "dfs.datanode.address" : "0.0.0.0:50010",
-        "dfs.datanode.balance.bandwidthPerSec" : "6250000",
-        "dfs.datanode.data.dir" : "/hadoop/hdfs/data",
-        "dfs.datanode.data.dir.perm" : "750",
-        "dfs.datanode.du.reserved" : "1",
-        "dfs.datanode.failed.volumes.tolerated" : "0",
-        "dfs.datanode.http.address" : "0.0.0.0:50075",
-        "dfs.datanode.ipc.address" : "0.0.0.0:8010",
-        "dfs.datanode.max.transfer.threads" : "1024",
-        "dfs.domain.socket.path" : "/var/lib/hadoop-hdfs/dn_socket",
-        "dfs.heartbeat.interval" : "3",
-        "dfs.hosts.exclude" : "/etc/hadoop/conf/dfs.exclude",
-        "dfs.https.namenode.https-address" : "dev05.hortonworks.com:50470",
-        "dfs.journalnode.edits.dir" : "/grid/0/hdfs/journal",
-        "dfs.journalnode.http-address" : "0.0.0.0:8480",
-        "dfs.namenode.accesstime.precision" : "0",
-        "dfs.namenode.avoid.read.stale.datanode" : "true",
-        "dfs.namenode.avoid.write.stale.datanode" : "true",
-        "dfs.namenode.handler.count" : "100",
-        "dfs.namenode.http-address" : "dev05.hortonworks.com:50070",
-        "dfs.namenode.name.dir" : "/hadoop/hdfs/namenode",
-        "dfs.namenode.safemode.threshold-pct" : "1.0f",
-        "dfs.namenode.secondary.http-address" : "dev05.hortonworks.com:50090",
-        "dfs.namenode.stale.datanode.interval" : "30000",
-        "dfs.namenode.write.stale.datanode.ratio" : "1.0f",
-        "dfs.permissions.enabled" : "true",
-        "dfs.permissions.superusergroup" : "hdfs",
-        "dfs.replication" : "3",
-        "dfs.replication.max" : "50",
-        "dfs.webhdfs.enabled" : "true",
-        "fs.permissions.umask-mode" : "022"
-      }
-    }
-  ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/11dd9df8/ambari-client/src/test/python/json/clustermodel_get_host.json
----------------------------------------------------------------------
diff --git a/ambari-client/src/test/python/json/clustermodel_get_host.json b/ambari-client/src/test/python/json/clustermodel_get_host.json
deleted file mode 100644
index b1b09d6..0000000
--- a/ambari-client/src/test/python/json/clustermodel_get_host.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
-  "href" : "http://localhost:8080/api/v1/clusters/test1/hosts/myhost",
-  "Hosts" : {
-    "cluster_name" : "test1",
-    "cpu_count" : 24,
-    "disk_info" : [
-      {
-        "available" : "25938900",
-        "used" : "5743652",
-        "percent" : "19%",
-        "size" : "33378088",
-        "type" : "ext4",
-        "mountpoint" : "/"
-      },
-      {
-        "available" : "49525536",
-        "used" : "0",
-        "percent" : "0%",
-        "size" : "49525536",
-        "type" : "tmpfs",
-        "mountpoint" : "/dev/shm"
-      },
-      {
-        "available" : "433221",
-        "used" : "37023",
-        "percent" : "8%",
-        "size" : "495844",
-        "type" : "ext4",
-        "mountpoint" : "/boot"
-      },
-      {
-        "available" : "3020752",
-        "used" : "71284",
-        "percent" : "3%",
-        "size" : "3257512",
-        "type" : "ext4",
-        "mountpoint" : "/home"
-      },
-      {
-        "available" : "547125892",
-        "used" : "404652",
-        "percent" : "1%",
-        "size" : "576831992",
-        "type" : "ext4",
-        "mountpoint" : "/data/1"
-      },
-      {
-        "available" : "547305068",
-        "used" : "225476",
-        "percent" : "1%",
-        "size" : "576831992",
-        "type" : "ext4",
-        "mountpoint" : "/data/2"
-      },
-      {
-        "available" : "547325924",
-        "used" : "204620",
-        "percent" : "1%",
-        "size" : "576831992",
-        "type" : "ext4",
-        "mountpoint" : "/data/3"
-      },
-      {
-        "available" : "547320928",
-        "used" : "209616",
-        "percent" : "1%",
-        "size" : "576831992",
-        "type" : "ext4",
-        "mountpoint" : "/data/4"
-      },
-      {
-        "available" : "547315544",
-        "used" : "215000",
-        "percent" : "1%",
-        "size" : "576831992",
-        "type" : "ext4",
-        "mountpoint" : "/data/5"
-      },
-      {
-        "available" : "547327008",
-        "used" : "203536",
-        "percent" : "1%",
-        "size" : "576831992",
-        "type" : "ext4",
-        "mountpoint" : "/data/6"
-      },
-      {
-        "available" : "547310644",
-        "used" : "219900",
-        "percent" : "1%",
-        "size" : "576831992",
-        "type" : "ext4",
-        "mountpoint" : "/data/7"
-      },
-      {
-        "available" : "547320544",
-        "used" : "210000",
-        "percent" : "1%",
-        "size" : "576831992",
-        "type" : "ext4",
-        "mountpoint" : "/data/8"
-      }
-    ],
-    "host_health_report" : "",
-    "host_name" : "myhost",
-    "host_state" : "HEALTHY",
-    "host_status" : "HEALTHY",
-    "ip" : "10.104.44.95",
-    "last_agent_env" : {
-      "stackFoldersAndFiles" : [ ],
-      "rpms" : [
-        {
-          "name" : "nagios",
-          "installed" : true,
-          "version" : "nagios-3.5.0-99.x86_64"
-        },
-        {
-          "name" : "ganglia",
-          "installed" : false
-        },
-        {
-          "name" : "hadoop",
-          "installed" : true,
-          "version" : "hadoop-1.2.0.1.3.0.0-107.el6.x86_64"
-        },
-        {
-          "name" : "hadoop-lzo",
-          "installed" : true,
-          "version" : "hadoop-lzo-0.5.0-1.x86_64"
-        },
-        {
-          "name" : "hbase",
-          "installed" : false
-        },
-        {
-          "name" : "oozie",
-          "installed" : true,
-          "version" : "oozie-3.3.2.1.3.0.0-107.el6.noarch"
-        },
-        {
-          "name" : "sqoop",
-          "installed" : false
-        },
-        {
-          "name" : "pig",
-          "installed" : false
-        },
-        {
-          "name" : "zookeeper",
-          "installed" : true,
-          "version" : "zookeeper-3.4.5.1.3.0.0-107.el6.noarch"
-        },
-        {
-          "name" : "hive",
-          "installed" : true,
-          "version" : "hive-0.11.0.1.3.0.0-107.el6.noarch"
-        },
-        {
-          "name" : "libconfuse",
-          "installed" : true,
-          "version" : "libconfuse-2.6-3.el6.x86_64"
-        },
-        {
-          "name" : "ambari-log4j",
-          "installed" : true,
-          "version" : "ambari-log4j-1.2.3.6-1.noarch"
-        }
-      ],
-      "alternatives" : [ ],
-      "existingUsers" : [ ],
-      "existingRepos" : [
-        "unable_to_determine"
-      ],
-      "installedPackages" : [ ],
-      "hostHealth" : {
-        "activeJavaProcs" : [ ],
-        "agentTimeStampAtReporting" : 1377776815389,
-        "serverTimeStampAtReporting" : 1377776801984,
-        "liveServices" : [
-          {
-            "name" : "ntpd",
-            "desc" : "ntpd is stopped\n",
-            "status" : "Unhealthy"
-          }
-        ],
-        "diskStatus" : [
-          {
-            "available" : "25032456",
-            "used" : "6650096",
-            "percent" : "21%",
-            "size" : "33378088",
-            "type" : "ext4",
-            "mountpoint" : "/"
-          }
-        ]
-      }
-    },
-    "last_heartbeat_time" : 1377776827188,
-    "last_registration_time" : 1377605551901,
-    "os_arch" : "x86_64",
-    "os_type" : "redhat6",
-    "ph_cpu_count" : 2,
-    "public_host_name" : "myhost",
-    "rack_info" : "/default-rack",
-    "total_mem" : 99048488,
-    "desired_configs" : { }
-  },
-  "host_components" : [
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/hosts/myhost/host_components/GANGLIA_MONITOR",
-      "HostRoles" : {
-        "cluster_name" : "test1",
-        "component_name" : "GANGLIA_MONITOR",
-        "host_name" : "myhost"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/hosts/myhost/host_components/GANGLIA_SERVER",
-      "HostRoles" : {
-        "cluster_name" : "test1",
-        "component_name" : "GANGLIA_SERVER",
-        "host_name" : "myhost"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/hosts/myhost/host_components/MAPREDUCE_CLIENT",
-      "HostRoles" : {
-        "cluster_name" : "test1",
-        "component_name" : "MAPREDUCE_CLIENT",
-        "host_name" : "myhost"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/hosts/myhost/host_components/NAGIOS_SERVER",
-      "HostRoles" : {
-        "cluster_name" : "test1",
-        "component_name" : "NAGIOS_SERVER",
-        "host_name" : "myhost"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/hosts/myhost/host_components/NAMENODE",
-      "HostRoles" : {
-        "cluster_name" : "test1",
-        "component_name" : "NAMENODE",
-        "host_name" : "myhost"
-      }
-    }
-  ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/11dd9df8/ambari-client/src/test/python/json/clustermodel_get_mapred_site_config.json
----------------------------------------------------------------------
diff --git a/ambari-client/src/test/python/json/clustermodel_get_mapred_site_config.json b/ambari-client/src/test/python/json/clustermodel_get_mapred_site_config.json
deleted file mode 100644
index 1080be1..0000000
--- a/ambari-client/src/test/python/json/clustermodel_get_mapred_site_config.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "href" : "http://localhost:8080/api/v1/clusters/test1/configurations?type=mapred-site&tag=version1",
-  "items" : [
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/configurations?type=mapred-site&tag=version1",
-      "tag" : "version1",
-      "type" : "mapred-site",
-      "Config" : {
-        "cluster_name" : "test1"
-      },
-      "properties" : {
-        "mapred.hosts" : "/etc/hadoop/conf/mapred.include",
-        "mapred.hosts.exclude" : "/etc/hadoop/conf/mapred.exclude",
-        "mapred.jobtracker.maxtasks.per.job" : "-1",
-        "mapred.jobtracker.taskScheduler" : "org.apache.hadoop.mapred.CapacityTaskScheduler",
-        "mapred.task.tracker.task-controller" : "org.apache.hadoop.mapred.DefaultTaskController",
-        "mapred.userlog.retain.hours" : "24",
-        "mapreduce.admin.map.child.java.opts" : "-Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN",
-        "mapreduce.admin.reduce.child.java.opts" : "-Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN",
-        "mapreduce.admin.user.env" : "LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/`$JAVA_HOME/bin/java -d32 -version &> /dev/null;if [ $? -eq 0 ]; then echo Linux-i386-32; else echo Linux-amd64-64;fi`",
-        "mapreduce.am.max-attempts" : "2",
-        "mapreduce.application.classpath" : "$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/*,$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/lib/*",
-        "mapreduce.framework.name" : "yarn",
-        "mapreduce.job.reduce.slowstart.completedmaps" : "0.05",
-        "mapreduce.jobhistory.address" : "dev05.hortonworks.com:10020",
-        "mapreduce.jobhistory.done-dir" : "/mr-history/done",
-        "mapreduce.jobhistory.intermediate-done-dir" : "/mr-history/tmp",
-        "mapreduce.jobhistory.webapp.address" : "dev05.hortonworks.com:19888",
-        "mapreduce.jobtracker.system.dir" : "/mapred/system",
-        "mapreduce.map.java.opts" : "-Xmx320m",
-        "mapreduce.map.log.level" : "INFO",
-        "mapreduce.map.memory.mb" : "1536",
-        "mapreduce.map.sort.spill.percent" : "0.1",
-        "mapreduce.map.speculative" : "false",
-        "mapreduce.output.fileoutputformat.compress.type" : "BLOCK",
-        "mapreduce.reduce.input.buffer.percent" : "0.0",
-        "mapreduce.reduce.java.opts" : "-Xmx756m",
-        "mapreduce.reduce.log.level" : "INFO",
-        "mapreduce.reduce.memory.mb" : "2048",
-        "mapreduce.reduce.shuffle.input.buffer.percent" : "0.7",
-        "mapreduce.reduce.shuffle.merge.percent" : "0.66",
-        "mapreduce.reduce.shuffle.parallelcopies" : "30",
-        "mapreduce.reduce.speculative" : "false",
-        "mapreduce.shuffle.port" : "13562",
-        "mapreduce.task.io.sort.factor" : "100",
-        "mapreduce.task.io.sort.mb" : "200",
-        "mapreduce.task.timeout" : "600000",
-        "mapreduce.tasktracker.healthchecker.script.path" : "file:////mapred/jobstatus",
-        "mapreduce.tasktracker.map.tasks.maximum" : "4",
-        "yarn.app.mapreduce.am.admin-command-opts" : "-Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN",
-        "yarn.app.mapreduce.am.command-opts" : "-Xmx756m",
-        "yarn.app.mapreduce.am.log.level" : "INFO",
-        "yarn.app.mapreduce.am.resource.mb" : "1024",
-        "yarn.app.mapreduce.am.staging-dir" : "/user"
-      }
-    }
-  ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/11dd9df8/ambari-client/src/test/python/json/clustermodel_get_service.json
----------------------------------------------------------------------
diff --git a/ambari-client/src/test/python/json/clustermodel_get_service.json b/ambari-client/src/test/python/json/clustermodel_get_service.json
deleted file mode 100644
index 0c9d5e7..0000000
--- a/ambari-client/src/test/python/json/clustermodel_get_service.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "href" : "http://localhost:8080/api/v1/clusters/test1/services/GANGLIA",
-  "ServiceInfo" : {
-    "cluster_name" : "test1",
-    "state" : "STARTED",
-    "service_name" : "GANGLIA",
-    "desired_configs" : {
-      "global" : "version1"
-    }
-  },
-  "components" : [
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/services/GANGLIA/components/GANGLIA_MONITOR",
-      "ServiceComponentInfo" : {
-        "cluster_name" : "test1",
-        "component_name" : "GANGLIA_MONITOR",
-        "service_name" : "GANGLIA"
-      }
-    },
-    {
-      "href" : "http://localhost:8080/api/v1/clusters/test1/services/GANGLIA/components/GANGLIA_SERVER",
-      "ServiceComponentInfo" : {
-        "cluster_name" : "test1",
-        "component_name" : "GANGLIA_SERVER",
-        "service_name" : "GANGLIA"
-      }
-    }
-  ]
-}
\ No newline at end of file