← Back to branch summary

~ltrager/maas/lp1593991

~ltrager/maas/lp1593991

« back to all changes in this revision

Viewing changes to src/maasserver/models/discovery.py

Committer: Lee Trager
Date: 2016-10-20 19:43:37 UTC
mfrom: (5489.1.6 maas)
Revision ID: lee.trager@canonical.com-20161020194337-rlji6q8lxinjbdjh

Merge trunk

files modified:
src/maasserver/api/blockdevices.py

src/maasserver/api/interfaces.py

src/maasserver/api/tests/test_blockdevice.py

src/maasserver/api/tests/test_interfaces.py

src/maasserver/api/tests/test_ipaddresses.py

src/maasserver/api/tests/test_machine.py

src/maasserver/dns/tests/test_zonegenerator.py

src/maasserver/forms.py

src/maasserver/forms_interface.py

src/maasserver/models/discovery.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/subnet.py

src/maasserver/models/tests/test_blockdevice.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/models/tests/test_subnet.py

src/maasserver/service_monitor.py

src/maasserver/static/js/angular/controllers/node_details_networking.js

src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js

src/maasserver/static/partials/node-details.html

src/maasserver/testing/factory.py

src/maasserver/tests/test_forms_blockdevice.py

src/maasserver/tests/test_forms_interface.py

src/maasserver/tests/test_forms_interface_link.py

src/maasserver/websockets/handlers/machine.py

src/maasserver/websockets/handlers/tests/test_device.py

src/maasserver/websockets/handlers/tests/test_machine.py

src/provisioningserver/dhcp/testing/config.py

src/provisioningserver/dhcp/tests/test_config.py

src/provisioningserver/rackdservices/tests/test_service_monitor_service.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/rpc/tests/test_dhcp.py

src/provisioningserver/service_monitor.py

src/provisioningserver/tests/test_service_monitor.py

src/provisioningserver/utils/network.py

src/provisioningserver/utils/service_monitor.py

src/provisioningserver/utils/tests/test_service_monitor.py

Show diffs side-by-side

added added

removed removed

src/maasserver/models/discovery.py

155

155

verbose_name = "Discovery"

156

156

verbose_name_plural = "Discoveries"

157

157

158

def __str__(self):

159

return "<Discovery: %s at %s via %s>" % (

160

self.ip, self.last_seen, self.observer_interface.get_log_string())

161

158

162

discovery_id = CharField(

159

163

max_length=256, editable=False, null=True, blank=False, unique=True)

160

164

Older »