From 114cc879ff23eabaaf7e7f72cb71e11dde6534f0 Mon Sep 17 00:00:00 2001 From: Federico Capoano Date: Mon, 22 Sep 2014 10:01:39 +0200 Subject: [PATCH] Renamed ProvinciaWIFI synchronizer to ProvinciaWifi for consistency #178 --- nodeshot/interoperability/settings.py | 2 +- .../synchronizers/ProvinciaWIFICitySDK.py | 4 ++-- .../synchronizers/{ProvinciaWIFI.py => ProvinciaWifi.py} | 5 ++--- .../synchronizers/ProvinciaWifiCitySdkMobility.py | 8 ++++---- nodeshot/interoperability/tests.py | 4 ++-- 5 files changed, 11 insertions(+), 12 deletions(-) rename nodeshot/interoperability/synchronizers/{ProvinciaWIFI.py => ProvinciaWifi.py} (98%) diff --git a/nodeshot/interoperability/settings.py b/nodeshot/interoperability/settings.py index d5a4eef5..ba54d236 100755 --- a/nodeshot/interoperability/settings.py +++ b/nodeshot/interoperability/settings.py @@ -7,7 +7,7 @@ ('nodeshot.interoperability.synchronizers.GeoRss', 'GeoRSS'), ('nodeshot.interoperability.synchronizers.OpenWisp', 'OpenWisp'), ('nodeshot.interoperability.synchronizers.OpenWispCitySdkTourism', 'OpenWispCitySdkTourism'), - ('nodeshot.interoperability.synchronizers.ProvinciaWIFI', 'Provincia WiFi'), + ('nodeshot.interoperability.synchronizers.ProvinciaWifi', 'Provincia WiFi'), ('nodeshot.interoperability.synchronizers.ProvinciaWIFICitySDK', 'ProvinciaWIFICitySDK'), ('nodeshot.interoperability.synchronizers.ProvinciaWifiCitySdkMobility', 'Synchronize Provincia Wifi with CitySDK Mobility'), ('nodeshot.interoperability.synchronizers.CitySdkMobility', 'CitySDK Mobility (event driven)'), diff --git a/nodeshot/interoperability/synchronizers/ProvinciaWIFICitySDK.py b/nodeshot/interoperability/synchronizers/ProvinciaWIFICitySDK.py index ffd093d0..6ed1a439 100755 --- a/nodeshot/interoperability/synchronizers/ProvinciaWIFICitySDK.py +++ b/nodeshot/interoperability/synchronizers/ProvinciaWIFICitySDK.py @@ -1,8 +1,8 @@ -from .ProvinciaWIFI import ProvinciaWIFI +from .ProvinciaWifi import ProvinciaWifi from .CitySdkTourism import CitySdkTourismMixin -class ProvinciaWIFICitySDK(CitySdkTourismMixin, ProvinciaWIFI): +class ProvinciaWIFICitySDK(CitySdkTourismMixin, ProvinciaWifi): """ ProvinciaWIFICitySDK interoperability class Imports data from Provincia WIFI Open Data and then exports the data to the CitySDK database diff --git a/nodeshot/interoperability/synchronizers/ProvinciaWIFI.py b/nodeshot/interoperability/synchronizers/ProvinciaWifi.py similarity index 98% rename from nodeshot/interoperability/synchronizers/ProvinciaWIFI.py rename to nodeshot/interoperability/synchronizers/ProvinciaWifi.py index 01c11ebe..c3552499 100755 --- a/nodeshot/interoperability/synchronizers/ProvinciaWIFI.py +++ b/nodeshot/interoperability/synchronizers/ProvinciaWifi.py @@ -4,12 +4,11 @@ from django.conf import settings from nodeshot.core.nodes.models import Node, Status - from nodeshot.interoperability.synchronizers.base import XmlSynchronizer -class ProvinciaWIFI(XmlSynchronizer): - """ ProvinciaWIFI interoperability class """ +class ProvinciaWifi(XmlSynchronizer): + """ ProvinciaWifi interoperability class """ def save(self): """ synchronize DB """ diff --git a/nodeshot/interoperability/synchronizers/ProvinciaWifiCitySdkMobility.py b/nodeshot/interoperability/synchronizers/ProvinciaWifiCitySdkMobility.py index 92bdbd6c..befb27b7 100755 --- a/nodeshot/interoperability/synchronizers/ProvinciaWifiCitySdkMobility.py +++ b/nodeshot/interoperability/synchronizers/ProvinciaWifiCitySdkMobility.py @@ -1,17 +1,17 @@ -from .ProvinciaWIFI import ProvinciaWIFI +from .ProvinciaWifi import ProvinciaWifi from .CitySdkMobility import CitySdkMobilityMixin -class ProvinciaWifiCitySdkMobility(CitySdkMobilityMixin, ProvinciaWIFI): +class ProvinciaWifiCitySdkMobility(CitySdkMobilityMixin, ProvinciaWifi): """ ProvinciaWIFICitySDK interoperability class Imports data from Provincia WIFI Open Data and then exports the data to the CitySDK Mobility API database """ - + REQUIRED_CONFIG_KEYS = [ 'url', 'citysdk_url', 'citysdk_layer', 'citysdk_username', 'citysdk_password' - ] \ No newline at end of file + ] diff --git a/nodeshot/interoperability/tests.py b/nodeshot/interoperability/tests.py index 4be073f0..3226ff93 100755 --- a/nodeshot/interoperability/tests.py +++ b/nodeshot/interoperability/tests.py @@ -216,7 +216,7 @@ def test_openwisp(self): self.assertEqual(node.added.strftime('%Y-%m-%d'), '2013-06-14') def test_provinciawifi(self): - """ test ProvinciaWIFI converter """ + """ test ProvinciaWifi synchronizer """ layer = Layer.objects.external()[0] layer.minimum_distance = 0 layer.area = None @@ -227,7 +227,7 @@ def test_provinciawifi(self): xml_url = '%s/provincia-wifi.xml' % TEST_FILES_PATH external = LayerExternal(layer=layer) - external.interoperability = 'nodeshot.interoperability.synchronizers.ProvinciaWIFI' + external.interoperability = 'nodeshot.interoperability.synchronizers.ProvinciaWifi' external.config = '{ "url": "%s" }' % xml_url external.save()