renaming SliceAttribute into SliceTag and InterfaceSetting into InterfaceTag

[plcapi.git] / PLC / Methods / DeleteInterfaceTag.py

diff --git a/PLC/Methods/DeleteInterfaceSetting.py b/PLC/Methods/DeleteInterfaceTag.py
similarity index 65%
rename from PLC/Methods/DeleteInterfaceSetting.py
rename to PLC/Methods/DeleteInterfaceTag.py
index dae3706..82da0dc 100644 (file)
--- a/PLC/Methods/DeleteInterfaceSetting.py
+++ b/PLC/Methods/DeleteInterfaceTag.py
@@ -10,13 +10,13 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Auth import Auth
 
-from PLC.InterfaceSettings import InterfaceSetting, InterfaceSettings
+from PLC.InterfaceTags import InterfaceTag, InterfaceTags
 from PLC.Interfaces import Interface, Interfaces
 
 from PLC.Nodes import Node, Nodes
 from PLC.Sites import Site, Sites
 
-class DeleteInterfaceSetting(Method):
+class DeleteInterfaceTag(Method):
     """
     Deletes the specified interface setting
 
@@ -31,7 +31,7 @@ class DeleteInterfaceSetting(Method):
 
     accepts = [
         Auth(),
-        InterfaceSetting.fields['interface_setting_id']
+        InterfaceTag.fields['interface_tag_id']
         ]
 
     returns = Parameter(int, '1 if successful')
@@ -39,19 +39,19 @@ class DeleteInterfaceSetting(Method):
     object_type = 'Interface'
 
 
-    def call(self, auth, interface_setting_id):
-        interface_settings = InterfaceSettings(self.api, [interface_setting_id])
-        if not interface_settings:
-            raise PLCInvalidArgument, "No such interface setting %r"%interface_setting_id
-        interface_setting = interface_settings[0]
+    def call(self, auth, interface_tag_id):
+        interface_tags = InterfaceTags(self.api, [interface_tag_id])
+        if not interface_tags:
+            raise PLCInvalidArgument, "No such interface tag %r"%interface_tag_id
+        interface_tag = interface_tags[0]
 
-        ### reproducing a check from UpdateSliceAttribute, looks dumb though
-        interfaces = Interfaces(self.api, [interface_setting['interface_id']])
+        ### reproducing a check from UpdateSliceTag, looks dumb though
+        interfaces = Interfaces(self.api, [interface_tag['interface_id']])
         if not interfaces:
-            raise PLCInvalidArgument, "No such interface %r"%interface_setting['interface_id']
+            raise PLCInvalidArgument, "No such interface %r"%interface_tag['interface_id']
         interface = interfaces[0]
 
-        assert interface_setting['interface_setting_id'] in interface['interface_setting_ids']
+        assert interface_tag['interface_tag_id'] in interface['interface_tag_ids']
 
        # check permission : it not admin, is the user affiliated with the right site
        if 'admin' not in self.caller['roles']:
@@ -68,7 +68,7 @@ class DeleteInterfaceSetting(Method):
                    min(self.caller['role_ids']) > required_min_role:
                raise PLCPermissionDenied, "Not allowed to modify the specified interface setting, requires role %d",required_min_role
 
-        interface_setting.delete()
-       self.object_ids = [interface_setting['interface_setting_id']]
+        interface_tag.delete()
+       self.object_ids = [interface_tag['interface_tag_id']]
 
         return 1