From 96413965c9502aa92248775e83d6e864b53692bc Mon Sep 17 00:00:00 2001 From: Julien Tribino Date: Thu, 3 Oct 2013 18:50:13 +0200 Subject: [PATCH] change the name of the exp-id in the OMF API for the EC one --- src/nepi/resources/omf/application.py | 2 -- src/nepi/resources/omf/channel.py | 2 -- src/nepi/resources/omf/interface.py | 2 -- src/nepi/resources/omf/node.py | 2 -- src/nepi/resources/omf/omf_api.py | 7 +------ 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/nepi/resources/omf/application.py b/src/nepi/resources/omf/application.py index 2f7628dd..a65c7756 100644 --- a/src/nepi/resources/omf/application.py +++ b/src/nepi/resources/omf/application.py @@ -88,8 +88,6 @@ class OMFApplication(OMFResource): @property def exp_id(self): - if self.ec.exp_id.startswith('exp-'): - return None return self.ec.exp_id @property diff --git a/src/nepi/resources/omf/channel.py b/src/nepi/resources/omf/channel.py index 20c60b57..e02593e7 100644 --- a/src/nepi/resources/omf/channel.py +++ b/src/nepi/resources/omf/channel.py @@ -72,8 +72,6 @@ class OMFChannel(OMFResource): @property def exp_id(self): - if self.ec.exp_id.startswith('exp-'): - return None return self.ec.exp_id def valid_connection(self, guid): diff --git a/src/nepi/resources/omf/interface.py b/src/nepi/resources/omf/interface.py index 0aea5bb1..08d39ec9 100644 --- a/src/nepi/resources/omf/interface.py +++ b/src/nepi/resources/omf/interface.py @@ -106,8 +106,6 @@ class OMFWifiInterface(OMFResource): @property def exp_id(self): - if self.ec.exp_id.startswith('exp-'): - return None return self.ec.exp_id @property diff --git a/src/nepi/resources/omf/node.py b/src/nepi/resources/omf/node.py index 68b4df39..840cfe18 100644 --- a/src/nepi/resources/omf/node.py +++ b/src/nepi/resources/omf/node.py @@ -73,8 +73,6 @@ class OMFNode(OMFResource): @property def exp_id(self): - if self.ec.exp_id.startswith('exp-'): - return None return self.ec.exp_id def valid_connection(self, guid): diff --git a/src/nepi/resources/omf/omf_api.py b/src/nepi/resources/omf/omf_api.py index baa585fd..5def17b9 100644 --- a/src/nepi/resources/omf/omf_api.py +++ b/src/nepi/resources/omf/omf_api.py @@ -29,8 +29,6 @@ from nepi.util.logger import Logger from nepi.resources.omf.omf_client import OMFClient from nepi.resources.omf.messages_5_4 import MessageHandler -from nepi.util.timefuncs import tsformat - class OMFAPI(Logger): """ .. class:: Class Args : @@ -70,10 +68,7 @@ class OMFAPI(Logger): """ super(OMFAPI, self).__init__("OMFAPI") - date = tsformat() - tz = -time.altzone if time.daylight != 0 else -time.timezone - date += "%+06.2f" % (tz / 3600) # timezone difference is in seconds - self._exp_id = exp_id or date + self._exp_id = exp_id self._user = "%s-%s" % (slice, self._exp_id) self._slice = slice self._host = host -- 2.43.0