fix team code review comments

Author: caberos

SoftLayer/CLI/email/detail.py SoftLayer/CLI/email/list.pySoftLayer/CLI/email/detail.py renamed to SoftLayer/CLI/email/list.py

@@ -1,4 +1,4 @@
-"""Get details for an image."""
+"""Get lists Email Delivery account Service """
 # :license: MIT, see LICENSE for more details.
 
 import click
@@ -13,10 +13,10 @@
 @click.command()
 @environment.pass_env
 def cli(env):
-    """Display the Email Delivery account informatino """
+    """Lists Email Delivery Service """
     manager = AccountManager(env.client)
     email_manager = EmailManager(env.client)
-    result = manager.get_Network_Message_Delivery_Accounts()
+    result = manager.get_network_message_delivery_accounts()
 
     table = formatting.KeyValueTable(['name', 'value'])
 
@@ -29,10 +29,8 @@ def cli(env):
                                    utils.lookup(email, 'type', 'description'),
                                    utils.lookup(email, 'vendor', 'keyName')])
 
-        overview_table = _build_overview_table(email_manager.get_AccountOverview(email.get('id')))
-        statistics = email_manager.get_statistics(email.get('id'),
-                                                  ["requests", "delivered", "opens", "clicks", "bounds"],
-                                                  True, True, True, 6)
+        overview_table = _build_overview_table(email_manager.get_account_overview(email.get('id')))
+        statistics = email_manager.get_statistics(email.get('id'))
 
         table.add_row(['email information', table_information])
         table.add_row(['email overview', overview_table])
@@ -43,7 +41,7 @@ def cli(env):
 
 
 def _build_overview_table(email_overview):
-    table = formatting.KeyValueTable(['name', 'value'])
+    table = formatting.Table(['name', 'value'])
     table.align['name'] = 'r'
     table.align['value'] = 'l'
 
@@ -57,7 +55,7 @@ def _build_overview_table(email_overview):
 
 
 def _build_statistics_table(statistics):
-    table = formatting.KeyValueTable(['name', 'value'])
+    table = formatting.Table(['name', 'value'])
     table.align['name'] = 'r'
     table.align['value'] = 'l'
 

SoftLayer/CLI/routes.py

@@ -120,7 +120,7 @@
     ('block:volume-set-note', 'SoftLayer.CLI.block.set_note:cli'),
 
     ('email', 'SoftLayer.CLI.email'),
-    ('email:detail', 'SoftLayer.CLI.email.detail:cli'),
+    ('email:list', 'SoftLayer.CLI.email.list:cli'),
 
     ('event-log', 'SoftLayer.CLI.event_log'),
     ('event-log:get', 'SoftLayer.CLI.event_log.get:cli'),

SoftLayer/managers/account.py

@@ -294,7 +294,7 @@ def get_routers(self, mask=None, location=None):
 
         return self.client['SoftLayer_Account'].getRouters(filter=object_filter, mask=mask)
 
-    def get_Network_Message_Delivery_Accounts(self):
+    def get_network_message_delivery_accounts(self):
         """Gets all Network Message delivery accounts.
 
         :returns: Network Message delivery accounts

SoftLayer/managers/email.py

@@ -1,7 +1,7 @@
 """
-    SoftLayer.account
+    SoftLayer.email
     ~~~~~~~~~~~~~~~~~~~~~~~
-    Account manager
+    Email manager
 
     :license: MIT, see License for more details.
 """
@@ -14,32 +14,32 @@
 
 
 class EmailManager(utils.IdentifierMixin, object):
-    """Common functions for getting information from the Account service
+    """Common functions for getting information from the email service
 
     :param SoftLayer.API.BaseClient client: the client instance
     """
 
     def __init__(self, client):
         self.client = client
 
-    def get_AccountOverview(self, identifier):
+    def get_account_overview(self, identifier):
         """Gets all the Network Message Delivery Account Overview
 
         :returns: Network Message Delivery Account overview
         """
         return self.client.call('SoftLayer_Network_Message_Delivery_Email_Sendgrid',
                                 'getAccountOverview', id=identifier)
 
-    def get_statistics(self, identifier, selectedStatistics,
-                       startDate, endDate, aggregatesOnly, days):
-        """Gets statistics Network Message Delivery Account
+    def get_statistics(self, identifier, days=30):
+        """gets statistics from email accounts
 
+        :days: range number
         :returns: statistics Network Message Delivery Account
         """
-        body = [selectedStatistics,
-                startDate,
-                endDate,
-                aggregatesOnly,
+        body = [["requests", "delivered", "opens", "clicks", "bounds"],
+                True,
+                True,
+                True,
                 days
                 ]
 

tests/CLI/modules/email_tests.py

@@ -10,6 +10,6 @@
 class EmailCLITests(testing.TestCase):
 
     def test_detail(self):
-        result = self.run_command(['email', 'detail'])
+        result = self.run_command(['email', 'list'])
         self.assert_no_fail(result)
         self.assert_called_with('SoftLayer_Account', 'getNetworkMessageDeliveryAccounts')

tests/managers/email_tests.py

@@ -8,19 +8,16 @@
 from SoftLayer import testing
 
 
-class AccountManagerTests(testing.TestCase):
+class EmailManagerTests(testing.TestCase):
 
     def test_get_AccountOverview(self):
         self.manager = EmailManager(self.client)
-        self.manager.get_AccountOverview(1232123)
+        self.manager.get_account_overview(1232123)
         self.assert_called_with('SoftLayer_Network_Message_Delivery_Email_Sendgrid',
                                 'getAccountOverview')
 
     def test_get_statistics(self):
         self.manager = EmailManager(self.client)
-        self.manager.get_statistics(1232123,
-                                    ["requests", "delivered", "opens", "clicks", "bounds"],
-                                    True,
-                                    True, True, 6)
+        self.manager.get_statistics(1232123, 6)
         self.assert_called_with('SoftLayer_Network_Message_Delivery_Email_Sendgrid',
                                 'getStatistics')