[CORD-1324-1328-1330-1331] Models for refactored Global ECORD service
Change-Id: Ib9c02d25bd65729c7faaa48d40b54a2ce6ffffac
diff --git a/xos/attic/remoteport_model.py b/xos/attic/eline_model.py
similarity index 100%
rename from xos/attic/remoteport_model.py
rename to xos/attic/eline_model.py
diff --git a/xos/attic/remoteport_model.py b/xos/attic/enterprisetenant_model.py
similarity index 100%
copy from xos/attic/remoteport_model.py
copy to xos/attic/enterprisetenant_model.py
diff --git a/xos/attic/header.py b/xos/attic/header.py
index f4db591..83b7a8c 100644
--- a/xos/attic/header.py
+++ b/xos/attic/header.py
@@ -6,8 +6,8 @@
from core.models import PlCoreBase
from core.models import Site
-METRONETWORK_KIND = "metronetwork"
-SERVICE_NAME = 'metronetwork'
+METRONETWORK_KIND = "metronet"
+SERVICE_NAME = 'metronet'
SERVICE_NAME_ELINE_VERBOSE = 'E-Line Service'
SERVICE_NAME_ELAN_VERBOSE = 'E-LAN Service'
SERVICE_NAME_ETREE_VERBOSE = 'E-Tree Service'
diff --git a/xos/attic/metronetworksystem_model.py b/xos/attic/metronetworksystem_model.py
deleted file mode 100644
index 358cf8d..0000000
--- a/xos/attic/metronetworksystem_model.py
+++ /dev/null
@@ -1,15 +0,0 @@
-def __init__(self, *args, **kwargs):
- super(MetroNetworkSystem, self).__init__(*args, **kwargs)
-
-def getAdminstrativeState(self):
- return self.administrativeState
-
-def setAdminstrativeState(self, value):
- self.administrativeState = value
-
-def getOperationalState(self):
- return self.operationalState
-
-def getRestUrl(self):
- return self.restUrl
-
diff --git a/xos/attic/networkedgeport_model.py b/xos/attic/networkedgeport_model.py
deleted file mode 100644
index 52f17fe..0000000
--- a/xos/attic/networkedgeport_model.py
+++ /dev/null
@@ -1,22 +0,0 @@
-def __unicode__(self):
- return u'%s' % (self.pid)
-
-def save(self, *args, **kwargs):
-
- if self.latlng:
- try:
- latlng_value = getattr(self, 'latlng').strip()
- if (latlng_value.startswith('[') and latlng_value.endswith(']') and latlng_value.index(',') > 0):
- lat = latlng_value[1: latlng_value.index(',')].strip()
- lng = latlng_value[latlng_value.index(',') + 1: len(latlng_value) - 1].strip()
-
- #If lat and lng are not floats, the code below should result in an error.
- lat_validation = float(lat)
- lng_validation = float(lng)
- else:
- raise ValueError("The lat/lng value is not formatted correctly.")
- except:
- raise ValueError("The lat/lng value is not formatted correctly.")
-
- super(NetworkEdgePort, self).save(*args, **kwargs)
-
diff --git a/xos/attic/servicespoke_model.py b/xos/attic/servicespoke_model.py
deleted file mode 100644
index 3fd623e..0000000
--- a/xos/attic/servicespoke_model.py
+++ /dev/null
@@ -1 +0,0 @@
-def __unicode__(self): return u'%s' % (self.name)
diff --git a/xos/attic/remoteport_model.py b/xos/attic/transportnetowrk_model.py
similarity index 100%
copy from xos/attic/remoteport_model.py
copy to xos/attic/transportnetowrk_model.py
diff --git a/xos/attic/usernetworkinterfaces_model.py b/xos/attic/usernetworkinterface_model.py
similarity index 100%
rename from xos/attic/usernetworkinterfaces_model.py
rename to xos/attic/usernetworkinterface_model.py