Merge branch 'develop' into develop-2.5

This commit is contained in:
Jeremy Stretch
2018-10-19 13:34:03 -04:00
9 changed files with 114 additions and 58 deletions

View File

@@ -1953,7 +1953,7 @@ class ConsolePortTest(APITestCase):
self.assertEqual(
sorted(response.data['results'][0]),
['device', 'id', 'name', 'url']
['device', 'id', 'is_connected', 'name', 'url']
)
def test_create_consoleport(self):
@@ -2068,7 +2068,7 @@ class ConsoleServerPortTest(APITestCase):
self.assertEqual(
sorted(response.data['results'][0]),
['device', 'id', 'name', 'url']
['device', 'id', 'is_connected', 'name', 'url']
)
def test_create_consoleserverport(self):
@@ -2179,7 +2179,7 @@ class PowerPortTest(APITestCase):
self.assertEqual(
sorted(response.data['results'][0]),
['device', 'id', 'name', 'url']
['device', 'id', 'is_connected', 'name', 'url']
)
def test_create_powerport(self):
@@ -2294,7 +2294,7 @@ class PowerOutletTest(APITestCase):
self.assertEqual(
sorted(response.data['results'][0]),
['device', 'id', 'name', 'url']
['device', 'id', 'is_connected', 'name', 'url']
)
def test_create_poweroutlet(self):
@@ -2430,7 +2430,7 @@ class InterfaceTest(APITestCase):
self.assertEqual(
sorted(response.data['results'][0]),
['device', 'id', 'name', 'url']
['device', 'id', 'is_connected', 'name', 'url']
)
def test_create_interface(self):