Merge pull request #491 from globocom/develop

Develop

Author: Malinoski

networkapi/api_interface/specs/interface_environments_post.json

@@ -15,12 +15,11 @@
             "type": "integer"
           },
           "environment": {
-            "type": "integer"
+            "type": ["integer", "null"]
           }
         },
         "required": [
-          "interface",
-          "environment"
+          "interface"
         ]
       }
     }

networkapi/interface/models.py

@@ -929,7 +929,7 @@ class EnvironmentInterface(BaseModel):
     log = logging.getLogger('EnvironmentInterface')
 
     id = models.AutoField(primary_key=True, db_column='id_int_ambiente')
-    ambiente = models.ForeignKey(Ambiente, db_column='id_ambiente')
+    ambiente = models.ForeignKey(Ambiente, db_column='id_ambiente', null=True, blank=True)
     interface = models.ForeignKey(Interface, db_column='id_interface')
     vlans = models.CharField(max_length=200, blank=True, null=True)
 
@@ -968,7 +968,13 @@ def create_v3(self, interface_environments):
         """Set new relationship between an interface and an environment."""
 
         self.interface = Interface.objects.get(id=int(interface_environments.get('interface')))
-        self.ambiente = Ambiente.objects.get(id=int(interface_environments.get('environment')))
+        
+        env_id = interface_environments.get('environment')
+        if env_id is not None:
+            self.ambiente = Ambiente.objects.get(id=int(env_id))
+        else:
+            self.ambiente = None
+        
         self.vlans = interface_environments.get('range_vlans')
 
         return self.save()

networkapi/plugins/Netconf/plugin.py

@@ -8,7 +8,7 @@
 import requests, json, os
 from django.db.utils import DatabaseError
 from networkapi.system.exceptions import VariableDoesNotExistException
-
+from networkapi.extra_logging import local
 
 
 log = logging.getLogger(__name__)
@@ -194,7 +194,8 @@ def exec_command(self, command, success_regex='', invalid_regex=None, error_rege
 
             response = requests.post(
                 url="http://localhost:5000/deploy",
-                headers={"Content-type": "application/json"},
+                headers={"Content-type": "application/json",
+                        "X-Request-Id": getattr(local, "request_id", None)},
                 data=json.dumps({
                     "address": self.equipment_access.fqdn,
                     "username": self.equipment_access.user,