Merge pull request #1456 from allmightyspiff/rwhois_removal

Removing the rwhois commands

Author: allmightyspiff

SoftLayer/CLI/routes.py

@@ -232,10 +232,6 @@
     ('order:quote', 'SoftLayer.CLI.order.quote:cli'),
     ('order:lookup', 'SoftLayer.CLI.order.lookup:cli'),
 
-    ('rwhois', 'SoftLayer.CLI.rwhois'),
-    ('rwhois:edit', 'SoftLayer.CLI.rwhois.edit:cli'),
-    ('rwhois:show', 'SoftLayer.CLI.rwhois.show:cli'),
-
     ('hardware', 'SoftLayer.CLI.hardware'),
     ('hardware:bandwidth', 'SoftLayer.CLI.hardware.bandwidth:cli'),
     ('hardware:cancel', 'SoftLayer.CLI.hardware.cancel:cli'),

SoftLayer/CLI/rwhois/__init__.py

@@ -56,7 +56,7 @@
 
 
 class NetworkManager(object):
-    """Manage SoftLayer network objects: VLANs, subnets, IPs and rwhois
+    """Manage SoftLayer network objects: VLANs, subnets and IPs
 
     See product information here: https://www.ibm.com/cloud/network
 
@@ -311,34 +311,6 @@ def detach_securitygroup_components(self, group_id, component_ids):
         return self.security_group.detachNetworkComponents(component_ids,
                                                            id=group_id)
 
-    def edit_rwhois(self, abuse_email=None, address1=None, address2=None,
-                    city=None, company_name=None, country=None,
-                    first_name=None, last_name=None, postal_code=None,
-                    private_residence=None, state=None):
-        """Edit rwhois record."""
-        update = {}
-        for key, value in [('abuseEmail', abuse_email),
-                           ('address1', address1),
-                           ('address2', address2),
-                           ('city', city),
-                           ('companyName', company_name),
-                           ('country', country),
-                           ('firstName', first_name),
-                           ('lastName', last_name),
-                           ('privateResidenceFlag', private_residence),
-                           ('state', state),
-                           ('postalCode', postal_code)]:
-            if value is not None:
-                update[key] = value
-
-        # If there's anything to update, update it
-        if update:
-            rwhois = self.get_rwhois()
-            return self.client['Network_Subnet_Rwhois_Data'].editObject(
-                update, id=rwhois['id'])
-
-        return True
-
     def edit_securitygroup(self, group_id, name=None, description=None):
         """Edit security group details.
 
@@ -408,13 +380,6 @@ def ip_lookup(self, ip_address):
         obj = self.client['Network_Subnet_IpAddress']
         return obj.getByIpAddress(ip_address, mask='hardware, virtualGuest')
 
-    def get_rwhois(self):
-        """Returns the RWhois information about the current account.
-
-        :returns: A dictionary containing the account's RWhois information.
-        """
-        return self.account.getRwhoisData()
-
     def get_securitygroup(self, group_id, **kwargs):
         """Returns the information about the given security group.
 

SoftLayer/CLI/rwhois/edit.py

@@ -92,7 +92,6 @@ To discover the available commands, simply type `slcli`.
           object-storage  Object Storage.
           order           View and order from the catalog.
           report          Reports.
-          rwhois          Referral Whois.
           securitygroup   Network security groups.
           setup           Edit configuration.
           shell           Enters a shell for slcli.

SoftLayer/CLI/rwhois/show.py

@@ -222,39 +222,6 @@ def test_detach_securitygroup_components(self):
                                 'detachNetworkComponents',
                                 identifier=100, args=([500, 600],))
 
-    def test_edit_rwhois(self):
-        result = self.network.edit_rwhois(
-            abuse_email='[email protected]',
-            address1='123 Test Street',
-            address2='Apt. #31',
-            city='Anywhere',
-            company_name='TestLayer',
-            country='US',
-            first_name='Bob',
-            last_name='Bobinson',
-            postal_code='9ba62',
-            private_residence=False,
-            state='TX')
-
-        self.assertEqual(result, True)
-        expected = {
-            'abuseEmail': '[email protected]',
-            'address1': '123 Test Street',
-            'address2': 'Apt. #31',
-            'city': 'Anywhere',
-            'companyName': 'TestLayer',
-            'country': 'US',
-            'firstName': 'Bob',
-            'lastName': 'Bobinson',
-            'postalCode': '9ba62',
-            'privateResidenceFlag': False,
-            'state': 'TX',
-        }
-        self.assert_called_with('SoftLayer_Network_Subnet_Rwhois_Data',
-                                'editObject',
-                                identifier='id',
-                                args=(expected,))
-
     def test_edit_securitygroup(self):
         result = self.network.edit_securitygroup(100, name='foobar')
 
@@ -290,12 +257,6 @@ def test_edit_securitygroup_rule_unset(self):
                                         'portRangeMin': -1, 'portRangeMax': -1,
                                         'ethertype': '', 'remoteIp': ''}],))
 
-    def test_get_rwhois(self):
-        result = self.network.get_rwhois()
-
-        self.assertEqual(result, fixtures.SoftLayer_Account.getRwhoisData)
-        self.assert_called_with('SoftLayer_Account', 'getRwhoisData')
-
     def test_get_securitygroup(self):
         result = self.network.get_securitygroup(100)