added create_network(), delete_network(), create_subnet(), delete_subnet(), process_t...

[plcapi.git] / PLC / SiteTags.py

diff --git a/PLC/SiteTags.py b/PLC/SiteTags.py
index 9b48e3c..a22d80d 100644 (file)
--- a/PLC/SiteTags.py
+++ b/PLC/SiteTags.py
@@ -5,9 +5,8 @@ from PLC.Faults import *
 from PLC.Parameter import Parameter
 from PLC.Filter import Filter
 from PLC.Table import Row, Table
-from PLC.Storage.AlchemyObj import AlchemyObj
+from PLC.Storage.AlchemyObject import AlchemyObj
 from PLC.TagTypes import TagType, TagTypes
-from PLC.Sites import Site
 
 class SiteTag(AlchemyObj):
     """
@@ -15,7 +14,7 @@ class SiteTag(AlchemyObj):
     To use, instantiate with a dict of values.
     """
 
-    table_name = 'site_tags'
+    tablename = 'site_tags'
     fields = {
         'site_tag_id': Parameter(int, "Site setting identifier", primary_key=True),
         'site_id': Parameter(int, "Site identifier"),
@@ -46,6 +45,7 @@ class SiteTags(list):
     """
 
     def __init__(self, api, site_tag_filter = None, columns = None):
+        from PLC.Sites import Site
         if not site_tag_filter:
             site_tags = SiteTag().select()
         if isinstance(site_tag_filter, (list, tuple, set, int, long)):
@@ -56,5 +56,6 @@ class SiteTags(list):
             raise PLCInvalidArgument, "Wrong site setting filter %r"%site_tag_filter
 
         for site_tag in site_tags:
+            site_tag = SiteTag(self.api, object=site_tag)
             self.append(site_tag)