CORD-1954: Remove obsolete files;
fix latlng validation;
replace prints with logging
Change-Id: I88d98667839a34f0e6fb3c70369ce20ece80cb04
diff --git a/xos/attic/bandwidthprofile_model.py b/xos/attic/bandwidthprofile_model.py
deleted file mode 100755
index db74626..0000000
--- a/xos/attic/bandwidthprofile_model.py
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-def __unicode__(self): return u'%s' % (self.name)
diff --git a/xos/attic/eline_model.py b/xos/attic/eline_model.py
deleted file mode 100755
index db74626..0000000
--- a/xos/attic/eline_model.py
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-def __unicode__(self): return u'%s' % (self.name)
diff --git a/xos/attic/enterprisetenant_model.py b/xos/attic/enterprisetenant_model.py
deleted file mode 100755
index db74626..0000000
--- a/xos/attic/enterprisetenant_model.py
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-def __unicode__(self): return u'%s' % (self.name)
diff --git a/xos/attic/header.py b/xos/attic/header.py
index 449bd6b..b7100ed 100755
--- a/xos/attic/header.py
+++ b/xos/attic/header.py
@@ -19,9 +19,4 @@
from core.models import XOSBase
from core.models import Site
-VNAAS_KIND = "vnaas"
-SERVICE_NAME = 'vnaas'
-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/transportnetwork_model.py b/xos/attic/transportnetwork_model.py
deleted file mode 100755
index 941aea2..0000000
--- a/xos/attic/transportnetwork_model.py
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-def __unicode__(self): return u'%s' % (self.name)
diff --git a/xos/attic/usernetworkinterface_model.py b/xos/attic/usernetworkinterface_model.py
index e48251c..121611e 100755
--- a/xos/attic/usernetworkinterface_model.py
+++ b/xos/attic/usernetworkinterface_model.py
@@ -14,9 +14,7 @@
# limitations under the License.
-def __unicode__(self): return u'%s' % (self.name)
-
-def save(self, *args, **kwargs):
+def __xos_save_base(self, *args, **kwargs):
if self.latlng:
try:
@@ -33,4 +31,5 @@
except:
raise ValueError("The lat/lng value is not formatted correctly.")
- super(UserNetworkInterface, self).save(*args, **kwargs)
+ return False # let xosbase know to save the model
+