from PLC.Config import Config
from PLC.Faults import *
import PLC.Methods
-import PLC.Legacy
import PLC.Accessors
def import_deep(name):
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacyNodeNetworks import v42rename, v43rename
-from PLC.Methods.AddInterface import AddInterface
-class AddNodeNetwork(AddInterface):
- """ Legacy version of AddInterface. """
- status = "deprecated"
- def call(self, auth, node_id_or_hostname, interface_fields):
- node_id_or_hostname=patch(node_id_or_hostname,v42rename)
- interface_fields=patch(interface_fields,v42rename)
- result=AddInterface.call(self,auth,node_id_or_hostname,interface_fields)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacyNodeNetworkSettings import v42rename, v43rename
-from PLC.Methods.AddInterfaceTag import AddInterfaceTag
-class AddNodeNetworkSetting(AddInterfaceTag):
- """ Legacy version of AddInterfaceTag. """
- status = "deprecated"
- def call(self, auth, interface_id, tag_type_id_or_name, value):
- interface_id=patch(interface_id,v42rename)
- tag_type_id_or_name=patch(tag_type_id_or_name,v42rename)
- value=patch(value,v42rename)
- result=AddInterfaceTag.call(self,auth,interface_id,tag_type_id_or_name,value)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacyNodeNetworkSettingTypes import v42rename, v43rename
-from PLC.Methods.AddTagType import AddTagType
-class AddNodeNetworkSettingType(AddTagType):
- """ Legacy version of AddTagType. """
- status = "deprecated"
- def call(self, auth, tag_type_fields):
- tag_type_fields=patch(tag_type_fields,v42rename)
- result=AddTagType.call(self,auth,tag_type_fields)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacySliceAttributes import v42rename, v43rename
-from PLC.Methods.AddSliceTag import AddSliceTag
-class AddSliceAttribute(AddSliceTag):
- """ Legacy version of AddSliceTag. """
- status = "deprecated"
- def call(self, auth, slice_id_or_name, tag_type_id_or_name, value, node_id_or_hostname = None, nodegroup_id_or_name = None):
- slice_id_or_name=patch(slice_id_or_name,v42rename)
- tag_type_id_or_name=patch(tag_type_id_or_name,v42rename)
- value=patch(value,v42rename)
- node_id_or_hostname=patch(node_id_or_hostname,v42rename)
- nodegroup_id_or_name=patch(nodegroup_id_or_name,v42rename)
- result=AddSliceTag.call(self,auth,slice_id_or_name,tag_type_id_or_name,value,node_id_or_hostname,nodegroup_id_or_name)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacySliceAttributeTypes import v42rename, v43rename
-from PLC.Methods.AddTagType import AddTagType
-class AddSliceAttributeType(AddTagType):
- """ Legacy version of AddTagType. """
- status = "deprecated"
- def call(self, auth, tag_type_fields):
- tag_type_fields=patch(tag_type_fields,v42rename)
- result=AddTagType.call(self,auth,tag_type_fields)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacyNodeNetworks import v42rename, v43rename
-from PLC.Methods.DeleteInterface import DeleteInterface
-class DeleteNodeNetwork(DeleteInterface):
- """ Legacy version of DeleteInterface. """
- status = "deprecated"
- def call(self, auth, interface_id):
- interface_id=patch(interface_id,v42rename)
- result=DeleteInterface.call(self,auth,interface_id)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacyNodeNetworkSettings import v42rename, v43rename
-from PLC.Methods.DeleteInterfaceTag import DeleteInterfaceTag
-class DeleteNodeNetworkSetting(DeleteInterfaceTag):
- """ Legacy version of DeleteInterfaceTag. """
- status = "deprecated"
- def call(self, auth, interface_tag_id):
- interface_tag_id=patch(interface_tag_id,v42rename)
- result=DeleteInterfaceTag.call(self,auth,interface_tag_id)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacyNodeNetworkSettingTypes import v42rename, v43rename
-from PLC.Methods.DeleteTagType import DeleteTagType
-class DeleteNodeNetworkSettingType(DeleteTagType):
- """ Legacy version of DeleteTagType. """
- status = "deprecated"
- def call(self, auth, tag_type_id_or_name):
- tag_type_id_or_name=patch(tag_type_id_or_name,v42rename)
- result=DeleteTagType.call(self,auth,tag_type_id_or_name)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacySliceAttributes import v42rename, v43rename
-from PLC.Methods.DeleteSliceTag import DeleteSliceTag
-class DeleteSliceAttribute(DeleteSliceTag):
- """ Legacy version of DeleteSliceTag. """
- status = "deprecated"
- def call(self, auth, slice_tag_id):
- slice_tag_id=patch(slice_tag_id,v42rename)
- result=DeleteSliceTag.call(self,auth,slice_tag_id)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacySliceAttributeTypes import v42rename, v43rename
-from PLC.Methods.DeleteTagType import DeleteTagType
-class DeleteSliceAttributeType(DeleteTagType):
- """ Legacy version of DeleteTagType. """
- status = "deprecated"
- def call(self, auth, tag_type_id_or_name):
- tag_type_id_or_name=patch(tag_type_id_or_name,v42rename)
- result=DeleteTagType.call(self,auth,tag_type_id_or_name)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacyNodeNetworkSettingTypes import v42rename, v43rename
-from PLC.Methods.GetTagTypes import GetTagTypes
-class GetNodeNetworkSettingTypes(GetTagTypes):
- """ Legacy version of GetTagTypes. """
- status = "deprecated"
- def call(self, auth, tag_type_filter = None, return_fields = None):
- tag_type_filter=patch(tag_type_filter,v42rename)
- return_fields=patch(return_fields,v42rename)
- result=GetTagTypes.call(self,auth,tag_type_filter,return_fields)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacyNodeNetworkSettings import v42rename, v43rename
-from PLC.Methods.GetInterfaceTags import GetInterfaceTags
-class GetNodeNetworkSettings(GetInterfaceTags):
- """ Legacy version of GetInterfaceTags. """
- status = "deprecated"
- def call(self, auth, interface_tag_filter = None, return_fields = None):
- interface_tag_filter=patch(interface_tag_filter,v42rename)
- return_fields=patch(return_fields,v42rename)
- result=GetInterfaceTags.call(self,auth,interface_tag_filter,return_fields)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacyNodeNetworks import v42rename, v43rename
-from PLC.Methods.GetInterfaces import GetInterfaces
-class GetNodeNetworks(GetInterfaces):
- """ Legacy version of GetInterfaces. """
- status = "deprecated"
- def call(self, auth, interface_filter = None, return_fields = None):
- interface_filter=patch(interface_filter,v42rename)
- return_fields=patch(return_fields,v42rename)
- result=GetInterfaces.call(self,auth,interface_filter,return_fields)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacySliceAttributeTypes import v42rename, v43rename
-from PLC.Methods.GetTagTypes import GetTagTypes
-class GetSliceAttributeTypes(GetTagTypes):
- """ Legacy version of GetTagTypes. """
- status = "deprecated"
- def call(self, auth, tag_type_filter = None, return_fields = None):
- tag_type_filter=patch(tag_type_filter,v42rename)
- return_fields=patch(return_fields,v42rename)
- result=GetTagTypes.call(self,auth,tag_type_filter,return_fields)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacySliceAttributes import v42rename, v43rename
-from PLC.Methods.GetSliceTags import GetSliceTags
-class GetSliceAttributes(GetSliceTags):
- """ Legacy version of GetSliceTags. """
- status = "deprecated"
- def call(self, auth, slice_tag_filter = None, return_fields = None):
- slice_tag_filter=patch(slice_tag_filter,v42rename)
- return_fields=patch(return_fields,v42rename)
- result=GetSliceTags.call(self,auth,slice_tag_filter,return_fields)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacyNodeNetworks import v42rename, v43rename
-from PLC.Methods.UpdateInterface import UpdateInterface
-class UpdateNodeNetwork(UpdateInterface):
- """ Legacy version of UpdateInterface. """
- status = "deprecated"
- def call(self, auth, interface_id, interface_fields):
- interface_id=patch(interface_id,v42rename)
- interface_fields=patch(interface_fields,v42rename)
- result=UpdateInterface.call(self,auth,interface_id,interface_fields)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacyNodeNetworkSettings import v42rename, v43rename
-from PLC.Methods.UpdateInterfaceTag import UpdateInterfaceTag
-class UpdateNodeNetworkSetting(UpdateInterfaceTag):
- """ Legacy version of UpdateInterfaceTag. """
- status = "deprecated"
- def call(self, auth, interface_tag_id, value):
- interface_tag_id=patch(interface_tag_id,v42rename)
- value=patch(value,v42rename)
- result=UpdateInterfaceTag.call(self,auth,interface_tag_id,value)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacyNodeNetworkSettingTypes import v42rename, v43rename
-from PLC.Methods.UpdateTagType import UpdateTagType
-class UpdateNodeNetworkSettingType(UpdateTagType):
- """ Legacy version of UpdateTagType. """
- status = "deprecated"
- def call(self, auth, tag_type_id_or_name, tag_type_fields):
- tag_type_id_or_name=patch(tag_type_id_or_name,v42rename)
- tag_type_fields=patch(tag_type_fields,v42rename)
- result=UpdateTagType.call(self,auth,tag_type_id_or_name,tag_type_fields)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacySliceAttributes import v42rename, v43rename
-from PLC.Methods.UpdateSliceTag import UpdateSliceTag
-class UpdateSliceAttribute(UpdateSliceTag):
- """ Legacy version of UpdateSliceTag. """
- status = "deprecated"
- def call(self, auth, slice_tag_id, value):
- slice_tag_id=patch(slice_tag_id,v42rename)
- value=patch(value,v42rename)
- result=UpdateSliceTag.call(self,auth,slice_tag_id,value)
- return patch(result,v43rename)
+++ /dev/null
-# $Id$
-# $URL$
-from PLC.v42Legacy import patch
-from PLC.v42LegacySliceAttributeTypes import v42rename, v43rename
-from PLC.Methods.UpdateTagType import UpdateTagType
-class UpdateSliceAttributeType(UpdateTagType):
- """ Legacy version of UpdateTagType. """
- status = "deprecated"
- def call(self, auth, tag_type_id_or_name, tag_type_fields):
- tag_type_id_or_name=patch(tag_type_id_or_name,v42rename)
- tag_type_fields=patch(tag_type_fields,v42rename)
- result=UpdateTagType.call(self,auth,tag_type_id_or_name,tag_type_fields)
- return patch(result,v43rename)
+++ /dev/null
-## Please use make index to update this file
-native_methods = """
-AddNodeNetwork
-AddNodeNetworkSetting
-AddNodeNetworkSettingType
-AddSliceAttribute
-AddSliceAttributeType
-DeleteNodeNetwork
-DeleteNodeNetworkSetting
-DeleteNodeNetworkSettingType
-DeleteSliceAttribute
-DeleteSliceAttributeType
-GetNodeNetworkSettingTypes
-GetNodeNetworkSettings
-GetNodeNetworks
-GetSliceAttributeTypes
-GetSliceAttributes
-UpdateNodeNetwork
-UpdateNodeNetworkSetting
-UpdateNodeNetworkSettingType
-UpdateSliceAttribute
-UpdateSliceAttributeType
-""".split()
from PLC.Auth import Auth
from PLC.NodeGroups import NodeGroup, NodeGroups
-class v43GetNodeGroups(Method):
+class GetNodeGroups(Method):
"""
Returns an array of structs containing details about node groups.
If nodegroup_filter is specified and is an array of node group
def call(self, auth, nodegroup_filter = None, return_fields = None):
return NodeGroups(self.api, nodegroup_filter, return_fields)
-
-
-nodegroup_fields = NodeGroup.fields.copy()
-nodegroup_fields['name'] = Parameter(str, "Legacy version of groupname", max = 50),
-
-class v42GetNodeGroups(v43GetNodeGroups):
- """
- Legacy wrapper for v42GetNodeGroups.
- """
-
- accepts = [
- Auth(),
- Mixed([Mixed(NodeGroup.fields['nodegroup_id'],
- NodeGroup.fields['groupname'])],
- Filter(nodegroup_fields)),
- Parameter([str], "List of fields to return", nullok = True)
- ]
-
- returns = [nodegroup_fields]
-
- def call(self, auth, nodegroup_filter = None, return_fields = None):
- # convert name -> groupname in both filters
- if isinstance(nodegroup_filter, dict):
- if nodegroup_filter.has_key('name'):
- groupname = nodegroup_filter.pop('name')
- if not nodegroup_filter.has_key('groupname'):
- nodegroup_filter['groupname']=groupname
-
- if isinstance(return_fields, list):
- if 'name' in return_fields:
- return_fields.remove('name')
- if 'groupname' not in return_fields:
- return_fields.append('groupname')
-
- nodegroups = NodeGroups(self.api, nodegroup_filter, return_fields)
- # if groupname is present, then create a name mapping
- for nodegroup in nodegroups:
- if nodegroup.has_key('groupname'):
- nodegroup['name']=nodegroup['groupname']
- return nodegroups
-
-class GetNodeGroups(v42GetNodeGroups):
- """
- Returns an array of structs containing details about node groups.
- If nodegroup_filter is specified and is an array of node group
- identifiers or names, or a struct of node group attributes, only
- node groups matching the filter will be returned. If return_fields
- is specified, only the specified details will be returned.
- """
-
- pass
admin_only = ['key', 'session', 'boot_nonce' ]
-class v43GetNodes(Method):
+class GetNodes(Method):
"""
Returns an array of structs containing details about nodes. If
node_filter is specified and is an array of node identifiers or
del node[field]
return nodes
-
-node_fields = Node.fields.copy()
-node_fields['nodenetwork_ids']=Parameter([int], "Legacy version of interface_ids")
-
-class v42GetNodes(v43GetNodes):
- """
- Legacy wrapper for v43GetNodes.
- """
-
- accepts = [
- Auth(),
- Mixed([Mixed(Node.fields['node_id'],
- Node.fields['hostname'])],
- Parameter(str,"hostname"),
- Parameter(int,"node_id"),
- Filter(node_fields)),
- Parameter([str], "List of fields to return", nullok = True),
- ]
- returns = [node_fields]
-
- def call(self, auth, node_filter = None, return_fields = None):
- # convert nodenetwork_ids -> interface_ids
- if isinstance(node_filter, dict):
- if node_filter.has_key('nodenetwork_ids'):
- interface_ids = node_filter.pop('nodenetwork_ids')
- if not node_filter.has_key('interface_ids'):
- node_filter['interface_ids']=interface_ids
-
- if isinstance(return_fields, list):
- if 'nodenetwork_ids' in return_fields:
- return_fields.remove('nodenetwork_ids')
- if 'interface_ids' not in return_fields:
- return_fields.append('interface_ids')
- nodes = v43GetNodes.call(self,auth,node_filter,return_fields)
- # if interface_ids are present, then create a nodenetwork_ids mapping
- for node in nodes:
- if node.has_key('interface_ids'):
- node['nodenetwork_ids']=node['interface_ids']
- return nodes
-
-class GetNodes(v42GetNodes):
- """
- Returns an array of structs containing details about nodes. If
- node_filter is specified and is an array of node identifiers or
- hostnames, or a struct of node attributes, only nodes matching the
- filter will be returned. If return_fields is specified, only the
- specified details will be returned.
-
- Some fields may only be viewed by admins.
- """
-
- pass
from PLC.Sites import Site, Sites
from PLC.Slices import Slice, Slices
-class v43GetSlices(Method):
+class GetSlices(Method):
"""
Returns an array of structs containing details about slices. If
slice_filter is specified and is an array of slice identifiers or
return slices
-slice_fields = Slice.fields.copy()
-slice_fields['slice_attribute_ids']=Parameter([int], "Legacy version of slice_tag_ids")
-
-class v42GetSlices(v43GetSlices):
- """
- Legacy wrapper for v43GetSlices.
- """
-
- accepts = [
- Auth(),
- Mixed([Mixed(Slice.fields['slice_id'],
- Slice.fields['name'])],
- Parameter(str,"name"),
- Parameter(int,"slice_id"),
- Filter(slice_fields)),
- Parameter([str], "List of fields to return", nullok = True)
- ]
-
- returns = [slice_fields]
-
- def call(self, auth, slice_filter = None, return_fields = None):
- # convert nodenetwork_ids -> interface_ids
- if isinstance(slice_filter, dict):
- if slice_filter.has_key('slice_attribute_ids'):
- slice_tag_ids = slice_filter.pop('slice_attribute_ids')
- if not slice_filter.has_key('slice_tag_ids'):
- slice_filter['slice_tag_ids']=slice_tag_ids
- if isinstance(return_fields, list):
- if 'slice_attribute_ids' in return_fields:
- return_fields.remove('slice_attribute_ids')
- if 'slice_tag_ids' not in return_fields:
- return_fields.append('slice_tag_ids')
- slices = v43GetSlices.call(self,auth,slice_filter,return_fields)
- # add in a slice_tag_ids -> slice_attribute_ids
- for slice in slices:
- if slice.has_key('slice_tag_ids'):
- slice['slice_attribute_ids']=slice['slice_tag_ids']
- return slices
-
-class GetSlices(v42GetSlices):
- """
- Returns an array of structs containing details about slices. If
- slice_filter is specified and is an array of slice identifiers or
- slice names, or a struct of slice attributes, only slices matching
- the filter will be returned. If return_fields is specified, only the
- specified details will be returned.
-
- Users may only query slices of which they are members. PIs may
- query any of the slices at their sites. Admins and nodes may query
- any slice. If a slice that cannot be queried is specified in
- slice_filter, details about that slice will not be returned.
- """
-
- pass
return slivers
-class v43GetSlivers(Method):
+class GetSlivers(Method):
"""
Returns a struct containing information about the specified node
(or calling node, if called by a node and node_id_or_hostname is
'timestamp': Parameter(int, "Timestamp of this call, in seconds since UNIX epoch"),
'node_id': Node.fields['node_id'],
'hostname': Node.fields['hostname'],
- 'networks': [Interface.fields],
+ 'interfaces': [Interface.fields],
'groups': [NodeGroup.fields['groupname']],
'conf_files': [ConfFile.fields],
'initscripts': [InitScript.fields],
raise PLCInvalidArgument, "Not a local node"
# Get interface information
- networks = Interfaces(self.api, node['interface_ids'])
+ interfaces = Interfaces(self.api, node['interface_ids'])
# Get node group information
nodegroups = NodeGroups(self.api, node['nodegroup_ids']).dict('groupname')
'timestamp': timestamp,
'node_id': node['node_id'],
'hostname': node['hostname'],
- 'networks': networks,
+ 'interfaces': interfaces,
'groups': groups,
'conf_files': conf_files.values(),
'initscripts': initscripts,
'slivers': slivers,
'accounts': accounts
}
-
-class v42GetSlivers(v43GetSlivers):
- """
- Legacy wrapper for v43GetSlivers.
- """
-
- def call(self, auth, node_id_or_hostname = None):
- result = v43GetSlivers.call(self,auth,node_id_or_hostname)
- networks = result['networks']
-
- for i in range(0,len(networks)):
- network = networks[i]
- if network.has_key("interface_id"):
- network['nodenetwork_id']=network['interface_id']
- if network.has_key("interface_tag_ids"):
- network['nodenetwork_setting_ids']=network['interface_tag_ids']
- networks[i]=network
-
- result['networks']=networks
- return result
-
-class GetSlivers(v42GetSlivers):
- """
- Returns a struct containing information about the specified node
- (or calling node, if called by a node and node_id_or_hostname is
- not specified), including the current set of slivers bound to the
- node.
-
- All of the information returned by this call can be gathered from
- other calls, e.g. GetNodes, GetInterfaces, GetSlices, etc. This
- function exists almost solely for the benefit of Node Manager.
- """
-
- pass
Table
TagTypes
sendmail
-v42Legacy
-v42LegacyNodeNetworkSettingTypes
-v42LegacyNodeNetworkSettings
-v42LegacyNodeNetworks
-v42LegacySliceAttributeTypes
-v42LegacySliceAttributes
""".split()
+++ /dev/null
-# $Id$
-# $URL$
-
-# apply rename on list (columns) or dict (filter) args
-def patch (arg,rename):
- if isinstance(arg,list):
- for i in range(0,len(arg)):
- arg[i] = patch(arg[i],rename)
- return arg
- if isinstance(arg,dict):
- return dict ( [ (rename(k),v) for (k,v) in arg.iteritems() ] )
- return rename(arg)
-
+++ /dev/null
-# $Id$
-# $URL$
-
-# mapping of argument/return names for *NodeNetworkSettingType*
-v42_to_v43_argmap = { "name":"tagname",
- "nodenetwork_setting_type_id": "tag_type_id",
- }
-v43_to_v42_argmap = dict([ (v,k) for k,v in v42_to_v43_argmap.iteritems()])
-
-def v42rename (x): return v42_to_v43_argmap.get(x,x)
-def v43rename (x): return v43_to_v42_argmap.get(x,x)
+++ /dev/null
-# $Id$
-# $URL$
-
-# mapping of argument/return names for *NodeNetworkSettings* and *InterfaceTags* calls
-v42_to_v43_argmap = {
- "nodenetwork_id":"interface_id",
- "nodenetwork_ids":"interface_ids",
- "nodenetwork_setting_id":"interface_tag_id",
- "nodenetwork_setting_ids":"interface_tag_ids",
- "nodenetwork_setting_type_id":"tag_type_id",
- "name":"tagname"
- }
-v43_to_v42_argmap = dict([ (v,k) for k,v in v42_to_v43_argmap.iteritems()])
-
-def v42rename (x): return v42_to_v43_argmap.get(x,x)
-def v43rename (x): return v43_to_v42_argmap.get(x,x)
+++ /dev/null
-# $Id$
-# $URL$
-
-# mapping of argument/return names for *NodeNetwork* and *Interface* calls
-v42_to_v43_argmap = {
- "nodenetwork_id":"interface_id",
- "nodenetwork_ids":"interface_ids",
- "nodenetwork_setting_ids":"interface_tag_ids",
-}
-v43_to_v42_argmap = dict([ (v,k) for k,v in v42_to_v43_argmap.iteritems()])
-
-def v42rename (x): return v42_to_v43_argmap.get(x,x)
-def v43rename (x): return v43_to_v42_argmap.get(x,x)
+++ /dev/null
-# $Id$
-# $URL$
-
-# mapping of argument/return names for *SliceAttributeType* calls
-
-v42_to_v43_argmap = { "name":"tagname",
- "slice_attribute_id":"slice_tag_id",
- "attribute_type_id":"tag_type_id",
- }
-v43_to_v42_argmap = dict([ (v,k) for k,v in v42_to_v43_argmap.iteritems()])
-
-def v42rename (x): return v42_to_v43_argmap.get(x,x)
-def v43rename (x): return v43_to_v42_argmap.get(x,x)
+++ /dev/null
-# $Id$
-# $URL$
-
-# mapping of argument/return names for *{SliceAttribute,NetworkSetting}Type* and *TagType* calls
-
-v42_to_v43_argmap = { "name":"tagname",
- "slice_attribute_id":"slice_tag_id",
- }
-v43_to_v42_argmap = dict([ (v,k) for k,v in v42_to_v43_argmap.iteritems()])
-
-def v42rename (x): return v42_to_v43_argmap.get(x,x)
-def v43rename (x): return v43_to_v42_argmap.get(x,x)