Merge pull request #575 from ChandraAddala/enums-feature

Enums feature

contrib/enum_metrics/README.md

@@ -5,7 +5,7 @@ This project contains some python utilities to work with enum metrics.
 
 ### Setup
 
-Get the [blue flood](https://github.com/rackerlabs/blueflood) repo from github. Execute the following commands
+Get the [blueflood](https://github.com/rackerlabs/blueflood) repo from github. Execute the following commands
 
     cd $BLUEFLOOD_REPO_LOCATION/contrib/enum_metrics
     virtualenv enums
@@ -38,7 +38,7 @@ excess enum (i.e. if its present in metrics_excess_enums table)
 ####Delete command
 
     usage: errant_enums.py delete [-h] [--dryrun] -m METRICNAME -t TENANTID
-                                  [-e {localhost,qe01,qe02,staging,prod}]
+                                  [-e {localhost}]
 
     optional arguments:
       -h, --help            show this help message and exit
@@ -49,7 +49,7 @@ excess enum (i.e. if its present in metrics_excess_enums table)
       -t TENANTID, --tenantId TENANTID
                             tenantId corresponding to the metric name to be
                             deleted
-      -e {localhost,qe01,qe02,staging,prod}, --env {localhost,qe01,qe02,staging,prod}
+      -e {localhost}, --env {localhost}
                             Environment we are pointing to
 
 Example Usage:
@@ -59,11 +59,11 @@ Example Usage:
 
 ####List command
 
-    usage: errant_enums.py list [-h] [-e {localhost,qe01,qe02,staging,prod}]
+    usage: errant_enums.py list [-h] [-e {localhost}]
 
     optional arguments:
       -h, --help            show this help message and exit
-      -e {localhost,qe01,qe02,staging,prod}, --env {localhost,qe01,qe02,staging,prod}
+      -e {localhost}, --env {localhost}
                             Environment we are pointing to
 
 

contrib/enum_metrics/enum_metrics/config.py

@@ -3,19 +3,24 @@
 
 
 class Config:
+
+    parser = SafeConfigParser()
+    parser.read(os.path.join(os.path.dirname(__file__), '..', 'config.ini'))
+
     def __init__(self, env):
         self.env = env
 
-        self.parser = SafeConfigParser()
-        self.parser.read(os.path.join(os.path.dirname(__file__), '..', 'config.ini'))
-
         print self.parser.sections()
 
     def __get_value(self, config_name):
-        return self.parser.get(self.env, config_name)
+        return Config.parser.get(self.env, config_name)
 
     def get_cassandra_nodes(self):
         return self.__get_value('cassandra_nodes').split(",")
 
     def get_es_nodes(self):
         return self.__get_value('es_nodes').split(",")
+
+    @staticmethod
+    def get_environments():
+        return Config.parser.sections()

contrib/enum_metrics/enum_metrics/errant_enums.py

@@ -6,10 +6,7 @@
 import config as cf
 
 LOCALHOST = 'localhost'
-QE01 = 'qe01'
-QE02 = 'qe02'
-STAGING = 'staging'
-PROD = 'prod'
+
 
 
 def parse_arguments(args):
@@ -32,10 +29,8 @@ def parse_arguments(args):
     delete_parser.add_argument('-t', '--tenantId',
                                required=True, help='tenantId corresponding to the metric name to be deleted')
 
-    environments = [LOCALHOST, QE01, QE02, STAGING, PROD]
-
     for p in [list_parser, delete_parser]:
-        p.add_argument('-e', '--env', choices=environments,
+        p.add_argument('-e', '--env', choices=cf.Config.get_environments(),
                        default=LOCALHOST, help='Environment we are pointing to')
 
     args = parser.parse_args(args)

contrib/enum_metrics/test/test_errant_enums.py

@@ -15,11 +15,11 @@ def test_valid_args_1(self):
 
     def test_valid_args_2(self):
         metric_name = 'metric.test'
-        args = em.parse_arguments(['delete', '--metricName', metric_name, '--tenantId', '836986', '-e', 'qe01'])
+        args = em.parse_arguments(['delete', '--metricName', metric_name, '--tenantId', '836986', '-e', em.LOCALHOST])
 
         self.assertEquals(args.dryrun, False)
         self.assertEquals(args.metricName, metric_name)
-        self.assertEquals(args.env, em.QE01)
+        self.assertEquals(args.env, em.LOCALHOST)
 
     def test_valid_args_3(self):
         metric_name = 'metric.test'