From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Wed, 16 Apr 2014 15:08:01 +0000 (+0200)
Subject: merge
X-Git-Tag: nepi-3.1.0~87
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6b78e1443aca048bea0848855e81b5690e63c011;hp=5cdfecff9302bf2621430bd0fc612af693a76fd6;p=nepi.git

merge
---

diff --git a/src/nepi/resources/omf/interface.py b/src/nepi/resources/omf/interface.py
index d6ce0a17..c78daa02 100644
--- a/src/nepi/resources/omf/interface.py
+++ b/src/nepi/resources/omf/interface.py
@@ -181,8 +181,8 @@ class OMFWifiInterface(OMFResource):
 
         # Just for information
         self.info(" " + self.get_rtype() + " ( Guid : " + str(self._guid) +") : " + \
-            self.get('mode') + " : " + self.get('type') + " : " + \
-            self.get('essid') + " : " + self.get('ip') + " : " + str(self.state))
+                self.get('mode') + " : " + self.get('type') + " : " + \
+                self.get('essid') + " : " + self.get('ip') + " : " + str(self.state))
     
         # Check if the node is already deployed
         if self.state < ResourceState.PROVISIONED:
@@ -192,7 +192,7 @@ class OMFWifiInterface(OMFResource):
         if self._conf == True:
             res = self.configure_ip()
             
-        if not (res or self._conf):
+        if not (res and self._conf):
             return
 
         super(OMFWifiInterface, self).do_deploy()