Merge "Use constants to validate sample type"

ceilometer/cmd/sample.py

@@ -36,9 +36,9 @@ def send_sample():
                    required=True),
         cfg.StrOpt('sample-type',
                    short='y',
-                   help='Meter type (gauge, delta, cumulative).',
-                   default='gauge',
-                   required=True),
+                   help='Meter type.',
+                   default=sample.TYPE_GAUGE,
+                   choices=sample.TYPES),
         cfg.StrOpt('sample-unit',
                    short='U',
                    help='Meter unit.'),