Merge "Add ability to clean up hosts and vlans"

[pharos-tools.git] / dashboard / src / resource_inventory / models.py

diff --git a/dashboard/src/resource_inventory/models.py b/dashboard/src/resource_inventory/models.py
index 5f7f3d3..bdc1f5d 100644 (file)
--- a/dashboard/src/resource_inventory/models.py
+++ b/dashboard/src/resource_inventory/models.py
@@ -184,6 +184,9 @@ class ResourceBundle(models.Model):
             return "Resource bundle " + str(self.id) + " with no template"
         return "instance of " + str(self.template)
 
+    def get_host(self, role="Jumphost"):
+        return Host.objects.filter(bundle=self, config__opnfvRole__name=role).first()
+
 
 # Networking
 
@@ -301,14 +304,14 @@ class RemoteInfo(models.Model):
 
 
 def get_default_remote_info():
-    RemoteInfo.objects.get_or_create(
+    return RemoteInfo.objects.get_or_create(
         address="default",
         mac_address="default",
         password="default",
         user="default",
         management_type="default",
         versions="[default]"
-    )
+    )[0].pk
 
 
 # Concrete host, actual machine in a lab