openstack
/
sahara-dashboard
Code Issues Proposed changes

Merge "Update dicts with plugin services"

This commit is contained in:
Jenkins 2014-04-15 14:06:17 +00:00 committed by Gerrit Code Review
parent 9ce69cf038 6daceadbe4
commit d10a05de49
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
saharadashboard/tests/cluster_template_tests/test_create_cluster_template.py
View File

@ -59,12 +59,11 @@ class UICreateClusterTemplate(base.UITestCase):
def test_create_cluster_template_for_hdp(self):
self.create_node_group_template(
'selenium-hdp-master',
["NN", "JT", "SNN", "GANGLIA_SERVER", "GANGLIA_MONITOR",
"NAGIOS_SERVER", "AMBARI_SERVER", "AMBARI_AGENT"], cfg.hdp)
["NN", "JT", "SNN", "GANGLIA_SERVER", "NAGIOS_SERVER",
"AMBARI_SERVER"], cfg.hdp)
self.create_node_group_template(
'selenium-hdp-worker',
["TT", "DN", "GANGLIA_MONITOR", "HDFS_CLIENT", "MAPREDUCE_CLIENT",
"AMBARI_AGENT"], cfg.hdp)
["TT", "DN", "HDFS_CLIENT", "MAPREDUCE_CLIENT"], cfg.hdp)
self.create_cluster_template(
"selenium-hdp", {'selenium-hdp-master': 1,
'selenium-hdp-worker': 2}, cfg.hdp,

15
saharadashboard/tests/configs/config.py
View File

@ -87,7 +87,7 @@ VanillaGroup = [
help="hadoop version for plugin"),
cfg.DictOpt('processes',
default={"NN": 0, "DN": 1, "SNN": 2,
"OZ": 3, "TT": 4, "JT": 5},
"OZ": 3, "TT": 4, "JT": 5, "hiveserver": 6},
help='numbers of processes for vanilla in saharadashboard'),
cfg.StrOpt('base_image',
default='ubuntu_sahara_latest',
@ -112,12 +112,17 @@ HdpGroup = [
cfg.StrOpt('hadoop_version',
default='1.3.2',
help="hadoop version for plugin"),
cfg.ListOpt('processes',
cfg.DictOpt('processes',
default=
{"NN": 0, "DN": 1, "SNN": 2, "HDFS_CLIENT": 3,
"GANGLIA_SERVER": 4, "GANGLIA_MONITOR": 5, "AMBARI_SERVER": 6,
"AMBARI_AGENT": 7, "JT": 8, "TT": 9, "MAPREDUCE_CLIENT": 10,
"NAGIOS_SERVER": 11},
" ZOOKEEPER_SERVER": 4, "ZOOKEEPER_CLIENT": 5,
"AMBARI_SERVER": 6, "HCAT": 7, "SQOOP": 8,
"JT": 9, "TT": 10, "MAPREDUCE_CLIENT": 11, "HIVE_SERVER": 12,
"HIVE_METASTORE": 13, "HIVE_CLIENT": 14, "MYSQL_SERVER": 15,
"PIG": 16, "WEBHCAT_SERVER": 17, "OOZIE_SERVER": 18,
"OOZIE_CLIENT": 19, "GANGLIA_SERVER": 20, "NAGIOS_SERVER": 21,
"HBASE_MASTER": 22, "HBASE_REGIONSERVER": 23,
"HBASE_CLIENT": 24},
help='numbers of processes for hdp in saharadashboard'),
cfg.StrOpt('base_image',
default='ib-centos-6-4-64-hdp-13',

3
saharadashboard/tests/node_group_template_tests/test_create_node_group_template.py
View File

@ -50,8 +50,7 @@ class UICreateNodeGroupTemplate(base.UITestCase):
'tests for hdp plugin skipped')
def test_create_node_group_template_hdp(self):
self.create_node_group_template(
"sel-hdp", ["NN", "JT", "HDFS_CLIENT", "AMBARI_SERVER",
"AMBARI_AGENT"], cfg.hdp,
"sel-hdp", ["NN", "JT", "HDFS_CLIENT", "AMBARI_SERVER"], cfg.hdp,
flavor="m1.small", storage={'type': "Cinder Volume",
'volume_per_node': '2',
'volume_size': '6'},