Merge branch 'master' into issue1283

Author: allmightyspiff

SoftLayer/CLI/routes.py

@@ -290,6 +290,7 @@
     ('subnet:detail', 'SoftLayer.CLI.subnet.detail:cli'),
     ('subnet:list', 'SoftLayer.CLI.subnet.list:cli'),
     ('subnet:lookup', 'SoftLayer.CLI.subnet.lookup:cli'),
+    ('subnet:edit-ip', 'SoftLayer.CLI.subnet.edit_ip:cli'),
 
     ('tags', 'SoftLayer.CLI.tags'),
     ('tags:cleanup', 'SoftLayer.CLI.tags.cleanup:cli'),

SoftLayer/CLI/subnet/detail.py

@@ -25,7 +25,10 @@ def cli(env, identifier, no_vs, no_hardware):
     mgr = SoftLayer.NetworkManager(env.client)
     subnet_id = helpers.resolve_id(mgr.resolve_subnet_ids, identifier,
                                    name='subnet')
-    subnet = mgr.get_subnet(subnet_id)
+
+    mask = 'mask[ipAddresses[id, ipAddress,note], datacenter, virtualGuests, hardware]'
+
+    subnet = mgr.get_subnet(subnet_id, mask=mask)
 
     table = formatting.KeyValueTable(['name', 'value'])
     table.align['name'] = 'r'
@@ -49,6 +52,14 @@ def cli(env, identifier, no_vs, no_hardware):
     table.add_row(['tags',
                    formatting.tags(subnet.get('tagReferences'))])
 
+    ip_address = subnet.get('ipAddresses')
+
+    ip_table = formatting.KeyValueTable(['id', 'ip', 'note'])
+    for address in ip_address:
+        ip_table.add_row([address.get('id'), address.get('ipAddress'), address.get('note')])
+
+    table.add_row(['ipAddresses', ip_table])
+
     if not no_vs:
         if subnet['virtualGuests']:
             vs_table = formatting.Table(['hostname', 'domain', 'public_ip', 'private_ip'])

SoftLayer/CLI/subnet/edit_ip.py

@@ -0,0 +1,27 @@
+"""Edit ip note"""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+from SoftLayer.CLI import environment
+
+
+@click.command()
+@click.argument('identifier')
+@click.option('--note', help="set ip address note of subnet")
+@environment.pass_env
+def cli(env, identifier, note):
+    """Set the note of the ipAddress"""
+
+    data = {
+        'note': note
+    }
+    mgr = SoftLayer.NetworkManager(env.client)
+    ip_id = None
+    if str.isdigit(identifier):
+        ip_id = identifier
+    else:
+        ip_object = mgr.get_ip_by_address(identifier)
+        ip_id = ip_object.get('id')
+    mgr.set_subnet_ipddress_note(ip_id, data)

SoftLayer/fixtures/SoftLayer_Network_Subnet.py

@@ -34,6 +34,11 @@
                  'name': 'subnet: test tag'},
          }
     ]
+    'ipAddresses': [
+        {'id': 123456,
+         'ipAddress': '16.26.26.25'},
+        {'id': 123457,
+         'ipAddress': '16.26.26.26'}]
 }
 
 editNote = True

SoftLayer/fixtures/SoftLayer_Network_Subnet_IpAddress.py

@@ -7,3 +7,5 @@
     'isReserved': False,
     'subnetId': 5678,
 }
+
+editObject = True

SoftLayer/managers/network.py

@@ -752,3 +752,19 @@ def set_tags(self, tags, vlan_id):
         Just calls vlan.setTags, but if it fails from an APIError will retry.
         """
         self.vlan.setTags(tags, id=vlan_id)
+
+    def get_ip_by_address(self, ip_address):
+        """get the ip address object
+
+         :param string ip_address: the ip address to edit.
+         """
+        return self.client.call('SoftLayer_Network_Subnet_IpAddress', 'getByIpAddress', ip_address)
+
+    def set_subnet_ipddress_note(self, identifier, note):
+        """Set the ip address note of the subnet
+
+         :param integer identifier: the ip address ID to edit.
+          :param json note: the note to edit.
+        """
+        result = self.client.call('SoftLayer_Network_Subnet_IpAddress', 'editObject', note, id=identifier)
+        return result

docs/cli/subnet.rst

@@ -26,3 +26,7 @@ Subnets
 .. click:: SoftLayer.CLI.subnet.lookup:cli
     :prog: subnet lookup
     :show-nested:
+
+.. click:: SoftLayer.CLI.subnet.edit_ip:cli
+    :prog: subnet edit-ip
+    :show-nested:

tests/CLI/modules/subnet_tests.py

@@ -42,6 +42,11 @@ def test_detail(self):
                 'tags': [
                     'subnet: test tag'
                 ],
+                'ipAddresses': {
+                    '123456': '16.26.26.25',
+                    '123457': '16.26.26.26'},
+                'hardware': 'none',
+                'usable ips': 22
             },
             json.loads(result.output))
 
@@ -170,3 +175,13 @@ def test_edit_note_failure(self, click):
         click.secho.assert_called_with('Failed to edit note', fg='red')
         self.assert_no_fail(result)
         self.assert_called_with('SoftLayer_Network_Subnet', 'editNote', identifier=1234, args=("test",))
+
+    def test_editrou_Ip(self):
+        result = self.run_command(['subnet', 'edit-ip', '16.26.26.26', '--note=test'])
+        self.assert_no_fail(result)
+        self.assertTrue(result)
+
+    def test_editrou_Id(self):
+        result = self.run_command(['subnet', 'edit-ip', '123456', '--note=test'])
+        self.assert_no_fail(result)
+        self.assertTrue(result)