ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject [1/3] ambari git commit: AMBARI-8959. UI uses old sub-resource names for API requests to /stacks/. (akovalenko)
Date Tue, 30 Dec 2014 16:13:59 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk cef3f2ccb -> f1e86c999


http://git-wip-us.apache.org/repos/asf/ambari/blob/f1e86c99/ambari-web/test/service_components.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/service_components.js b/ambari-web/test/service_components.js
index efa4f66..6a0ea07 100644
--- a/ambari-web/test/service_components.js
+++ b/ambari-web/test/service_components.js
@@ -19,7 +19,7 @@
 module.exports = {
   "items" : [
     {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/FALCON",
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON",
       "StackServices" : {
         "comments" : "Data management and processing platform",
         "custom_commands" : [ ],
@@ -56,9 +56,9 @@ module.exports = {
           "OOZIE"
         ]
       },
-      "serviceComponents" : [
+      "components" : [
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/FALCON/serviceComponents/FALCON_CLIENT",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON/components/FALCON_CLIENT",
           "StackServiceComponents" : {
             "cardinality" : "1+",
             "component_category" : "CLIENT",
@@ -74,7 +74,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/FALCON/serviceComponents/FALCON_SERVER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON/components/FALCON_SERVER",
           "StackServiceComponents" : {
             "cardinality" : "1",
             "component_category" : "MASTER",
@@ -89,7 +89,7 @@ module.exports = {
           },
           "dependencies" : [
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/FALCON/serviceComponents/FALCON_SERVER/dependencies/OOZIE_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON/components/FALCON_SERVER/dependencies/OOZIE_CLIENT",
               "Dependencies" : {
                 "component_name" : "OOZIE_CLIENT",
                 "dependent_component_name" : "FALCON_SERVER",
@@ -99,7 +99,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/FALCON/serviceComponents/FALCON_SERVER/dependencies/OOZIE_SERVER",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON/components/FALCON_SERVER/dependencies/OOZIE_SERVER",
               "Dependencies" : {
                 "component_name" : "OOZIE_SERVER",
                 "dependent_component_name" : "FALCON_SERVER",
@@ -113,7 +113,7 @@ module.exports = {
       ]
     },
     {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/FLUME",
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FLUME",
       "StackServices" : {
         "comments" : "Data management and processing platform",
         "custom_commands" : [ ],
@@ -145,9 +145,9 @@ module.exports = {
           "HDFS"
         ]
       },
-      "serviceComponents" : [
+      "components" : [
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/FLUME/serviceComponents/FLUME_HANDLER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FLUME/components/FLUME_HANDLER",
           "StackServiceComponents" : {
             "cardinality" : "0+",
             "component_category" : "SLAVE",
@@ -165,7 +165,7 @@ module.exports = {
       ]
     },
     {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/GANGLIA",
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/GANGLIA",
       "StackServices" : {
         "comments" : "Ganglia Metrics Collection system (<a href=\"http://oss.oetiker.ch/rrdtool/\"
target=\"_blank\">RRDTool</a> will be installed too)",
         "custom_commands" : [ ],
@@ -185,9 +185,9 @@ module.exports = {
           }
         }
       },
-      "serviceComponents" : [
+      "components" : [
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/GANGLIA/serviceComponents/GANGLIA_MONITOR",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/GANGLIA/components/GANGLIA_MONITOR",
           "StackServiceComponents" : {
             "cardinality" : "ALL",
             "component_category" : "SLAVE",
@@ -206,7 +206,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/GANGLIA/serviceComponents/GANGLIA_SERVER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/GANGLIA/components/GANGLIA_SERVER",
           "StackServiceComponents" : {
             "cardinality" : "1",
             "component_category" : "MASTER",
@@ -224,7 +224,7 @@ module.exports = {
       ]
     },
     {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HBASE",
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HBASE",
       "StackServices" : {
         "comments" : "Non-relational distributed database and centralized service for configuration
management &\n        synchronization\n      ",
         "custom_commands" : [ ],
@@ -262,9 +262,9 @@ module.exports = {
           }
         }
       },
-      "serviceComponents" : [
+      "components" : [
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HBASE/serviceComponents/HBASE_CLIENT",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HBASE/components/HBASE_CLIENT",
           "StackServiceComponents" : {
             "cardinality" : "1+",
             "component_category" : "CLIENT",
@@ -280,7 +280,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HBASE/serviceComponents/HBASE_MASTER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HBASE/components/HBASE_MASTER",
           "StackServiceComponents" : {
             "cardinality" : "1+",
             "component_category" : "MASTER",
@@ -297,7 +297,7 @@ module.exports = {
           },
           "dependencies" : [
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HBASE/serviceComponents/HBASE_MASTER/dependencies/HDFS_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HBASE/components/HBASE_MASTER/dependencies/HDFS_CLIENT",
               "Dependencies" : {
                 "component_name" : "HDFS_CLIENT",
                 "dependent_component_name" : "HBASE_MASTER",
@@ -307,7 +307,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HBASE/serviceComponents/HBASE_MASTER/dependencies/ZOOKEEPER_SERVER",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HBASE/components/HBASE_MASTER/dependencies/ZOOKEEPER_SERVER",
               "Dependencies" : {
                 "component_name" : "ZOOKEEPER_SERVER",
                 "dependent_component_name" : "HBASE_MASTER",
@@ -319,7 +319,7 @@ module.exports = {
           ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HBASE/serviceComponents/HBASE_REGIONSERVER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HBASE/components/HBASE_REGIONSERVER",
           "StackServiceComponents" : {
             "cardinality" : "1+",
             "component_category" : "SLAVE",
@@ -337,7 +337,7 @@ module.exports = {
       ]
     },
     {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HDFS",
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS",
       "StackServices" : {
         "comments" : "Apache Hadoop Distributed File System",
         "custom_commands" : [ ],
@@ -379,9 +379,9 @@ module.exports = {
           }
         }
       },
-      "serviceComponents" : [
+      "components" : [
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HDFS/serviceComponents/DATANODE",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/components/DATANODE",
           "StackServiceComponents" : {
             "cardinality" : "1+",
             "component_category" : "SLAVE",
@@ -397,7 +397,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HDFS/serviceComponents/HDFS_CLIENT",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/components/HDFS_CLIENT",
           "StackServiceComponents" : {
             "cardinality" : "1+",
             "component_category" : "CLIENT",
@@ -413,7 +413,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HDFS/serviceComponents/JOURNALNODE",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/components/JOURNALNODE",
           "StackServiceComponents" : {
             "cardinality" : "0+",
             "component_category" : "SLAVE",
@@ -429,7 +429,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HDFS/serviceComponents/NAMENODE",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/components/NAMENODE",
           "StackServiceComponents" : {
             "cardinality" : "1-2",
             "component_category" : "MASTER",
@@ -447,7 +447,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HDFS/serviceComponents/SECONDARY_NAMENODE",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/components/SECONDARY_NAMENODE",
           "StackServiceComponents" : {
             "cardinality" : "1",
             "component_category" : "MASTER",
@@ -463,7 +463,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HDFS/serviceComponents/ZKFC",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/components/ZKFC",
           "StackServiceComponents" : {
             "cardinality" : "0+",
             "component_category" : "SLAVE",
@@ -481,7 +481,7 @@ module.exports = {
       ]
     },
     {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE",
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE",
       "StackServices" : {
         "comments" : "Data warehouse system for ad-hoc queries & analysis of large datasets
and table & storage management service",
         "custom_commands" : [ ],
@@ -524,9 +524,9 @@ module.exports = {
           }
         }
       },
-      "serviceComponents" : [
+      "components" : [
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE/serviceComponents/HIVE_CLIENT",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HIVE_CLIENT",
           "StackServiceComponents" : {
             "cardinality" : "1+",
             "component_category" : "CLIENT",
@@ -542,7 +542,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE/serviceComponents/HIVE_METASTORE",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HIVE_METASTORE",
           "StackServiceComponents" : {
             "cardinality" : "1",
             "component_category" : "MASTER",
@@ -562,7 +562,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE/serviceComponents/HIVE_SERVER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HIVE_SERVER",
           "StackServiceComponents" : {
             "cardinality" : "1",
             "component_category" : "MASTER",
@@ -577,7 +577,7 @@ module.exports = {
           },
           "dependencies" : [
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE/serviceComponents/HIVE_SERVER/dependencies/MAPREDUCE2_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HIVE_SERVER/dependencies/MAPREDUCE2_CLIENT",
               "Dependencies" : {
                 "component_name" : "MAPREDUCE2_CLIENT",
                 "dependent_component_name" : "HIVE_SERVER",
@@ -587,7 +587,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE/serviceComponents/HIVE_SERVER/dependencies/TEZ_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HIVE_SERVER/dependencies/TEZ_CLIENT",
               "Dependencies" : {
                 "component_name" : "TEZ_CLIENT",
                 "dependent_component_name" : "HIVE_SERVER",
@@ -597,7 +597,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE/serviceComponents/HIVE_SERVER/dependencies/YARN_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HIVE_SERVER/dependencies/YARN_CLIENT",
               "Dependencies" : {
                 "component_name" : "YARN_CLIENT",
                 "dependent_component_name" : "HIVE_SERVER",
@@ -607,7 +607,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE/serviceComponents/HIVE_SERVER/dependencies/ZOOKEEPER_SERVER",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HIVE_SERVER/dependencies/ZOOKEEPER_SERVER",
               "Dependencies" : {
                 "component_name" : "ZOOKEEPER_SERVER",
                 "dependent_component_name" : "HIVE_SERVER",
@@ -619,7 +619,7 @@ module.exports = {
           ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/WEBHCAT/serviceComponents/WEBHCAT_SERVER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER",
           "StackServiceComponents" : {
             "cardinality" : "1",
             "component_category" : "MASTER",
@@ -634,7 +634,7 @@ module.exports = {
           },
           "dependencies" : [
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE/serviceComponents/WEBHCAT_SERVER/dependencies/HDFS_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/WEBHCAT_SERVER/dependencies/HDFS_CLIENT",
               "Dependencies" : {
                 "component_name" : "HDFS_CLIENT",
                 "dependent_component_name" : "WEBHCAT_SERVER",
@@ -644,7 +644,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE/serviceComponents/WEBHCAT_SERVER/dependencies/MAPREDUCE2_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/WEBHCAT_SERVER/dependencies/MAPREDUCE2_CLIENT",
               "Dependencies" : {
                 "component_name" : "MAPREDUCE2_CLIENT",
                 "dependent_component_name" : "WEBHCAT_SERVER",
@@ -654,7 +654,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/WEBHCAT/serviceComponents/WEBHCAT_SERVER/dependencies/YARN_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER/dependencies/YARN_CLIENT",
               "Dependencies" : {
                 "component_name" : "YARN_CLIENT",
                 "dependent_component_name" : "WEBHCAT_SERVER",
@@ -664,7 +664,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/WEBHCAT/serviceComponents/WEBHCAT_SERVER/dependencies/ZOOKEEPER_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER/dependencies/ZOOKEEPER_CLIENT",
               "Dependencies" : {
                 "component_name" : "ZOOKEEPER_CLIENT",
                 "dependent_component_name" : "WEBHCAT_SERVER",
@@ -674,7 +674,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/WEBHCAT/serviceComponents/WEBHCAT_SERVER/dependencies/ZOOKEEPER_SERVER",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER/dependencies/ZOOKEEPER_SERVER",
               "Dependencies" : {
                 "component_name" : "ZOOKEEPER_SERVER",
                 "dependent_component_name" : "WEBHCAT_SERVER",
@@ -686,7 +686,7 @@ module.exports = {
           ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE/serviceComponents/MYSQL_SERVER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/MYSQL_SERVER",
           "StackServiceComponents" : {
             "cardinality" : "0-1",
             "component_category" : "MASTER",
@@ -702,7 +702,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE/serviceComponents/HCAT",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HCAT",
           "StackServiceComponents" : {
             "cardinality" : null,
             "component_category" : "CLIENT",
@@ -720,7 +720,7 @@ module.exports = {
       ]
     },
     {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/MAPREDUCE2",
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/MAPREDUCE2",
       "StackServices" : {
         "comments" : "Apache Hadoop NextGen MapReduce (YARN)",
         "custom_commands" : [ ],
@@ -757,9 +757,9 @@ module.exports = {
           }
         }
       },
-      "serviceComponents" : [
+      "components" : [
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/MAPREDUCE2/serviceComponents/HISTORYSERVER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/MAPREDUCE2/components/HISTORYSERVER",
           "StackServiceComponents" : {
             "cardinality" : "1",
             "component_category" : "MASTER",
@@ -778,7 +778,7 @@ module.exports = {
           },
           "dependencies" : [
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/MAPREDUCE2/serviceComponents/HISTORYSERVER/dependencies/HDFS_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/MAPREDUCE2/components/HISTORYSERVER/dependencies/HDFS_CLIENT",
               "Dependencies" : {
                 "component_name" : "HDFS_CLIENT",
                 "dependent_component_name" : "HISTORYSERVER",
@@ -790,7 +790,7 @@ module.exports = {
           ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/MAPREDUCE2/serviceComponents/MAPREDUCE2_CLIENT",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/MAPREDUCE2/components/MAPREDUCE2_CLIENT",
           "StackServiceComponents" : {
             "cardinality" : "0+",
             "component_category" : "CLIENT",
@@ -808,7 +808,7 @@ module.exports = {
       ]
     },
     {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/NAGIOS",
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS",
       "StackServices" : {
         "comments" : "Nagios Monitoring and Alerting system",
         "custom_commands" : [ ],
@@ -828,9 +828,9 @@ module.exports = {
           }
         }
       },
-      "serviceComponents" : [
+      "components" : [
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/NAGIOS/serviceComponents/NAGIOS_SERVER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER",
           "StackServiceComponents" : {
             "cardinality" : "1",
             "component_category" : "MASTER",
@@ -845,7 +845,7 @@ module.exports = {
           },
           "dependencies" : [
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/NAGIOS/serviceComponents/NAGIOS_SERVER/dependencies/HCAT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/HCAT",
               "Dependencies" : {
                 "component_name" : "HCAT",
                 "dependent_component_name" : "NAGIOS_SERVER",
@@ -855,7 +855,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/NAGIOS/serviceComponents/NAGIOS_SERVER/dependencies/HDFS_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/HDFS_CLIENT",
               "Dependencies" : {
                 "component_name" : "HDFS_CLIENT",
                 "dependent_component_name" : "NAGIOS_SERVER",
@@ -865,7 +865,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/NAGIOS/serviceComponents/NAGIOS_SERVER/dependencies/MAPREDUCE2_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/MAPREDUCE2_CLIENT",
               "Dependencies" : {
                 "component_name" : "MAPREDUCE2_CLIENT",
                 "dependent_component_name" : "NAGIOS_SERVER",
@@ -875,7 +875,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/NAGIOS/serviceComponents/NAGIOS_SERVER/dependencies/OOZIE_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/OOZIE_CLIENT",
               "Dependencies" : {
                 "component_name" : "OOZIE_CLIENT",
                 "dependent_component_name" : "NAGIOS_SERVER",
@@ -885,7 +885,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/NAGIOS/serviceComponents/NAGIOS_SERVER/dependencies/TEZ_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/TEZ_CLIENT",
               "Dependencies" : {
                 "component_name" : "TEZ_CLIENT",
                 "dependent_component_name" : "NAGIOS_SERVER",
@@ -895,7 +895,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/NAGIOS/serviceComponents/NAGIOS_SERVER/dependencies/YARN_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/YARN_CLIENT",
               "Dependencies" : {
                 "component_name" : "YARN_CLIENT",
                 "dependent_component_name" : "NAGIOS_SERVER",
@@ -909,7 +909,7 @@ module.exports = {
       ]
     },
     {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/OOZIE",
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE",
       "StackServices" : {
         "comments" : "System for workflow coordination and execution of Apache Hadoop jobs.
 This also includes the installation of the optional Oozie Web Console which relies on and
will install the <a target=\"_blank\" href=\"http://www.sencha.com/legal/open-source-faq/\">ExtJS</a>
Library.\n      ",
         "custom_commands" : [ ],
@@ -946,9 +946,9 @@ module.exports = {
           }
         }
       },
-      "serviceComponents" : [
+      "components" : [
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/OOZIE/serviceComponents/OOZIE_CLIENT",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/components/OOZIE_CLIENT",
           "StackServiceComponents" : {
             "cardinality" : "1+",
             "component_category" : "CLIENT",
@@ -963,7 +963,7 @@ module.exports = {
           },
           "dependencies" : [
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/OOZIE/serviceComponents/OOZIE_CLIENT/dependencies/HDFS_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/components/OOZIE_CLIENT/dependencies/HDFS_CLIENT",
               "Dependencies" : {
                 "component_name" : "HDFS_CLIENT",
                 "dependent_component_name" : "OOZIE_CLIENT",
@@ -973,7 +973,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/OOZIE/serviceComponents/OOZIE_CLIENT/dependencies/MAPREDUCE2_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/components/OOZIE_CLIENT/dependencies/MAPREDUCE2_CLIENT",
               "Dependencies" : {
                 "component_name" : "MAPREDUCE2_CLIENT",
                 "dependent_component_name" : "OOZIE_CLIENT",
@@ -985,7 +985,7 @@ module.exports = {
           ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/OOZIE/serviceComponents/OOZIE_SERVER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/components/OOZIE_SERVER",
           "StackServiceComponents" : {
             "cardinality" : "1",
             "component_category" : "MASTER",
@@ -1000,7 +1000,7 @@ module.exports = {
           },
           "dependencies" : [
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/OOZIE/serviceComponents/OOZIE_SERVER/dependencies/HDFS_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/components/OOZIE_SERVER/dependencies/HDFS_CLIENT",
               "Dependencies" : {
                 "component_name" : "HDFS_CLIENT",
                 "dependent_component_name" : "OOZIE_SERVER",
@@ -1010,7 +1010,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/OOZIE/serviceComponents/OOZIE_SERVER/dependencies/MAPREDUCE2_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/components/OOZIE_SERVER/dependencies/MAPREDUCE2_CLIENT",
               "Dependencies" : {
                 "component_name" : "MAPREDUCE2_CLIENT",
                 "dependent_component_name" : "OOZIE_SERVER",
@@ -1020,7 +1020,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/OOZIE/serviceComponents/OOZIE_SERVER/dependencies/YARN_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/components/OOZIE_SERVER/dependencies/YARN_CLIENT",
               "Dependencies" : {
                 "component_name" : "YARN_CLIENT",
                 "dependent_component_name" : "OOZIE_SERVER",
@@ -1034,7 +1034,7 @@ module.exports = {
       ]
     },
     {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/PIG",
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/PIG",
       "StackServices" : {
         "comments" : "Scripting platform for analyzing large datasets",
         "custom_commands" : [ ],
@@ -1066,9 +1066,9 @@ module.exports = {
           }
         }
       },
-      "serviceComponents" : [
+      "components" : [
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/PIG/serviceComponents/PIG",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/PIG/components/PIG",
           "StackServiceComponents" : {
             "cardinality" : "0+",
             "component_category" : "CLIENT",
@@ -1086,7 +1086,7 @@ module.exports = {
       ]
     },
     {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/SQOOP",
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/SQOOP",
       "StackServices" : {
         "comments" : "Tool for transferring bulk data between Apache Hadoop and\n       
structured data stores such as relational databases\n      ",
         "custom_commands" : [ ],
@@ -1108,9 +1108,9 @@ module.exports = {
           }
         }
       },
-      "serviceComponents" : [
+      "components" : [
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/SQOOP/serviceComponents/SQOOP",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/SQOOP/components/SQOOP",
           "StackServiceComponents" : {
             "cardinality" : "1+",
             "component_category" : "CLIENT",
@@ -1125,7 +1125,7 @@ module.exports = {
           },
           "dependencies" : [
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/SQOOP/serviceComponents/SQOOP/dependencies/HDFS_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/SQOOP/components/SQOOP/dependencies/HDFS_CLIENT",
               "Dependencies" : {
                 "component_name" : "HDFS_CLIENT",
                 "dependent_component_name" : "SQOOP",
@@ -1135,7 +1135,7 @@ module.exports = {
               }
             },
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/SQOOP/serviceComponents/SQOOP/dependencies/MAPREDUCE2_CLIENT",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/SQOOP/components/SQOOP/dependencies/MAPREDUCE2_CLIENT",
               "Dependencies" : {
                 "component_name" : "MAPREDUCE2_CLIENT",
                 "dependent_component_name" : "SQOOP",
@@ -1149,7 +1149,7 @@ module.exports = {
       ]
     },
     {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/STORM",
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/STORM",
       "StackServices" : {
         "comments" : "Apache Hadoop Stream processing framework",
         "custom_commands" : [ ],
@@ -1176,9 +1176,9 @@ module.exports = {
           }
         }
       },
-      "serviceComponents" : [
+      "components" : [
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/STORM/serviceComponents/DRPC_SERVER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/STORM/components/DRPC_SERVER",
           "StackServiceComponents" : {
             "cardinality" : "1",
             "component_category" : "MASTER",
@@ -1194,7 +1194,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/STORM/serviceComponents/NIMBUS",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/STORM/components/NIMBUS",
           "StackServiceComponents" : {
             "cardinality" : "1",
             "component_category" : "MASTER",
@@ -1209,7 +1209,7 @@ module.exports = {
           },
           "dependencies" : [
             {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/STORM/serviceComponents/NIMBUS/dependencies/ZOOKEEPER_SERVER",
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/STORM/components/NIMBUS/dependencies/ZOOKEEPER_SERVER",
               "Dependencies" : {
                 "component_name" : "ZOOKEEPER_SERVER",
                 "dependent_component_name" : "NIMBUS",
@@ -1221,7 +1221,7 @@ module.exports = {
           ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/STORM/serviceComponents/STORM_REST_API",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/STORM/components/STORM_REST_API",
           "StackServiceComponents" : {
             "cardinality" : "1",
             "component_category" : "MASTER",
@@ -1237,7 +1237,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/STORM/serviceComponents/STORM_UI_SERVER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/STORM/components/STORM_UI_SERVER",
           "StackServiceComponents" : {
             "cardinality" : "1",
             "component_category" : "MASTER",
@@ -1253,7 +1253,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/STORM/serviceComponents/SUPERVISOR",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/STORM/components/SUPERVISOR",
           "StackServiceComponents" : {
             "cardinality" : "1+",
             "component_category" : "SLAVE",
@@ -1271,7 +1271,7 @@ module.exports = {
       ]
     },
     {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/TEZ",
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/TEZ",
       "StackServices" : {
         "comments" : "Tez is the next generation Hadoop Query Processing framework written
on top of YARN.",
         "custom_commands" : [ ],
@@ -1298,9 +1298,9 @@ module.exports = {
           }
         }
       },
-      "serviceComponents" : [
+      "components" : [
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/TEZ/serviceComponents/TEZ_CLIENT",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/TEZ/components/TEZ_CLIENT",
           "StackServiceComponents" : {
             "cardinality" : "1+",
             "component_category" : "CLIENT",
@@ -1318,7 +1318,7 @@ module.exports = {
       ]
     },
     {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/YARN",
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/YARN",
       "StackServices" : {
         "comments" : "Apache Hadoop NextGen MapReduce (YARN)",
         "custom_commands" : [ ],
@@ -1361,9 +1361,9 @@ module.exports = {
           }
         }
       },
-      "serviceComponents" : [
+      "components" : [
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/YARN/serviceComponents/APP_TIMELINE_SERVER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/YARN/components/APP_TIMELINE_SERVER",
           "StackServiceComponents" : {
             "cardinality" : "0-1",
             "component_category" : "MASTER",
@@ -1379,7 +1379,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/YARN/serviceComponents/NODEMANAGER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/YARN/components/NODEMANAGER",
           "StackServiceComponents" : {
             "cardinality" : "1+",
             "component_category" : "SLAVE",
@@ -1395,7 +1395,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/YARN/serviceComponents/RESOURCEMANAGER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/YARN/components/RESOURCEMANAGER",
           "StackServiceComponents" : {
             "cardinality" : "1-2",
             "component_category" : "MASTER",
@@ -1414,7 +1414,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/YARN/serviceComponents/YARN_CLIENT",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/YARN/components/YARN_CLIENT",
           "StackServiceComponents" : {
             "cardinality" : "1+",
             "component_category" : "CLIENT",
@@ -1432,7 +1432,7 @@ module.exports = {
       ]
     },
     {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/ZOOKEEPER",
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/ZOOKEEPER",
       "StackServices" : {
         "comments" : "Centralized service which provides highly reliable distributed\n  
     coordination.",
         "custom_commands" : [ ],
@@ -1462,9 +1462,9 @@ module.exports = {
           }
         }
       },
-      "serviceComponents" : [
+      "components" : [
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/ZOOKEEPER/serviceComponents/ZOOKEEPER_CLIENT",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/ZOOKEEPER/components/ZOOKEEPER_CLIENT",
           "StackServiceComponents" : {
             "cardinality" : "1+",
             "component_category" : "CLIENT",
@@ -1480,7 +1480,7 @@ module.exports = {
           "dependencies" : [ ]
         },
         {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/ZOOKEEPER/serviceComponents/ZOOKEEPER_SERVER",
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/ZOOKEEPER/components/ZOOKEEPER_SERVER",
           "StackServiceComponents" : {
             "cardinality" : "1+",
             "component_category" : "MASTER",

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1e86c99/ambari-web/test/stack.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/stack.js b/ambari-web/test/stack.js
index c9e0432..40d7198 100644
--- a/ambari-web/test/stack.js
+++ b/ambari-web/test/stack.js
@@ -27,7 +27,7 @@ module.exports = {
         "stack_name": "HDP",
         "stack_version": "1.3"
       },
-      "operatingSystems": [
+      "operating_systems": [
         {
           "OperatingSystems": {
             "os_type": "redhat5",
@@ -107,7 +107,7 @@ module.exports = {
         "stack_name": "HDP",
         "stack_version": "2.0.6"
       },
-      "operatingSystems": [
+      "operating_systems": [
         {
           "OperatingSystems": {
             "os_type": "redhat5",
@@ -188,7 +188,7 @@ module.exports = {
         "stack_name": "HDP",
         "stack_version": "2.1"
       },
-      "operatingSystems": [
+      "operating_systems": [
         {
           "OperatingSystems": {
             "os_type": "redhat5",


Mime
View raw message