From: Parker Berberian <pberberian@iol.unh.edu>
Date: Tue, 16 Apr 2019 13:59:21 +0000 (+0000)
Subject: Merge "Fixing Network Models"
X-Git-Tag: 2.0.99~120
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d8e9f0e33648426a95ae50bf27fa089036f6a1fd;p=laas.git

Merge "Fixing Network Models"
---

d8e9f0e33648426a95ae50bf27fa089036f6a1fd
diff --cc src/resource_inventory/models.py
index bdc1f5d,0b7b24c..d3f47d4
--- a/src/resource_inventory/models.py
+++ b/src/resource_inventory/models.py
@@@ -184,18 -190,12 +190,15 @@@ 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
- 
- 
  class GenericInterface(models.Model):
      id = models.AutoField(primary_key=True)
-     vlans = models.ManyToManyField(Vlan)
      profile = models.ForeignKey(InterfaceProfile, on_delete=models.CASCADE)
      host = models.ForeignKey(GenericHost, on_delete=models.CASCADE, related_name='generic_interfaces')
+     connections = models.ManyToManyField(NetworkConnection)
  
      def __str__(self):
          return "type " + str(self.profile) + " on host " + str(self.host)