Merge branch 'feature' into 6732-asn-model

netbox/ipam/tables/__init__.py

@@ -1,3 +1,4 @@
+from .fhrp import *
 from .ip import *
 from .services import *
 from .vlans import *

netbox/ipam/tables/fhrp.py

@@ -0,0 +1,68 @@
+import django_tables2 as tables
+
+from utilities.tables import BaseTable, ButtonsColumn, MarkdownColumn, TagColumn, ToggleColumn
+from ipam.models import *
+
+__all__ = (
+    'FHRPGroupTable',
+    'FHRPGroupAssignmentTable',
+)
+
+
+IPADDRESSES = """
+{% for ip in record.ip_addresses.all %}
+  <a href="{{ ip.get_absolute_url }}">{{ ip }}</a><br />
+{% endfor %}
+"""
+
+
+class FHRPGroupTable(BaseTable):
+    pk = ToggleColumn()
+    group_id = tables.Column(
+        linkify=True
+    )
+    comments = MarkdownColumn()
+    ip_addresses = tables.TemplateColumn(
+        template_code=IPADDRESSES,
+        orderable=False,
+        verbose_name='IP Addresses'
+    )
+    interface_count = tables.Column(
+        verbose_name='Interfaces'
+    )
+    tags = TagColumn(
+        url_name='ipam:fhrpgroup_list'
+    )
+
+    class Meta(BaseTable.Meta):
+        model = FHRPGroup
+        fields = (
+            'pk', 'group_id', 'protocol', 'auth_type', 'auth_key', 'description', 'ip_addresses', 'interface_count',
+            'tags',
+        )
+        default_columns = ('pk', 'group_id', 'protocol', 'auth_type', 'description', 'ip_addresses', 'interface_count')
+
+
+class FHRPGroupAssignmentTable(BaseTable):
+    pk = ToggleColumn()
+    object_parent = tables.Column(
+        accessor=tables.A('object.parent_object'),
+        linkify=True,
+        orderable=False,
+        verbose_name='Parent'
+    )
+    interface = tables.Column(
+        linkify=True,
+        orderable=False
+    )
+    group = tables.Column(
+        linkify=True
+    )
+    actions = ButtonsColumn(
+        model=FHRPGroupAssignment,
+        buttons=('edit', 'delete', 'foo')
+    )
+
+    class Meta(BaseTable.Meta):
+        model = FHRPGroupAssignment
+        fields = ('pk', 'group', 'object_parent', 'interface', 'priority')

netbox/ipam/tables/ip.py

@@ -13,6 +13,7 @@ __all__ = (
     'AggregateTable',
     'ASNTable',
     'InterfaceIPAddressTable',
+    'AssignedIPAddressesTable',
     'IPAddressAssignTable',
     'IPAddressTable',
     'IPRangeTable',
@@ -382,9 +383,9 @@ class IPAddressAssignTable(BaseTable):
         orderable = False
 
 
-class InterfaceIPAddressTable(BaseTable):
+class AssignedIPAddressesTable(BaseTable):
     """
-    List IP addresses assigned to a specific Interface.
+    List IP addresses assigned to an object.
     """
     address = tables.Column(
         linkify=True,