from PLC.Filter import Filter
from PLC.Debug import profile
from PLC.Table import Row, Table
-from PLC.NodeNetworks import NodeNetwork, NodeNetworks
+from PLC.Interfaces import Interface, Interfaces
from PLC.BootStates import BootStates
def valid_hostname(hostname):
table_name = 'nodes'
primary_key = 'node_id'
- # Thierry -- we use delete on nodenetworks so the related NodeNetworkSettings get deleted too
- join_tables = ['nodegroup_node', 'conf_file_node', 'pcu_node', 'slice_node', 'slice_attribute', 'node_session', 'peer_node','node_slice_whitelist']
+ join_tables = [ 'slice_node', 'peer_node', 'slice_attribute',
+ 'node_session', 'node_slice_whitelist',
+ 'node_tag', 'conf_file_node', 'pcu_node', ]
fields = {
'node_id': Parameter(int, "Node identifier"),
'hostname': Parameter(str, "Fully qualified hostname", max = 255),
'last_contact': Parameter(int, "Date and time when node last contacted plc", ro = True),
'key': Parameter(str, "(Admin only) Node key", max = 256),
'session': Parameter(str, "(Admin only) Node session value", max = 256, ro = True),
- 'nodenetwork_ids': Parameter([int], "List of network interfaces that this node has"),
- 'nodegroup_ids': Parameter([int], "List of node groups that this node is in"),
+ 'interface_ids': Parameter([int], "List of network interfaces that this node has"),
'conf_file_ids': Parameter([int], "List of configuration files specific to this node"),
# 'root_person_ids': Parameter([int], "(Admin only) List of people who have root access to this node"),
'slice_ids': Parameter([int], "List of slices on this node"),
'ports': Parameter([int], "List of PCU ports that this node is connected to"),
'peer_id': Parameter(int, "Peer to which this node belongs", nullok = True),
'peer_node_id': Parameter(int, "Foreign node identifier at peer", nullok = True),
+ 'tag_ids' : Parameter ([int], "List of tags attached to this node"),
+ 'nodegroup_ids': Parameter([int], "List of node groups that this node is in"),
}
related_fields = {
- 'nodenetworks': [Mixed(Parameter(int, "NodeNetwork identifier"),
- Filter(NodeNetwork.fields))],
+ 'interfaces': [Mixed(Parameter(int, "Interface identifier"),
+ Filter(Interface.fields))],
'nodegroups': [Mixed(Parameter(int, "NodeGroup identifier"),
Parameter(str, "NodeGroup name"))],
'conf_files': [Parameter(int, "ConfFile identifier")],
'slices_whitelist': [Mixed(Parameter(int, "Slice identifier"),
Parameter(str, "Slice name"))]
}
- # for Cache
- class_key = 'hostname'
- foreign_fields = ['boot_state','model','version']
- # forget about these ones, they are read-only anyway
- # handling them causes Cache to re-sync all over again
- # 'date_created','last_updated'
- foreign_xrefs = [
- # in this case, we dont need the 'table' but Cache will look it up, so...
- {'field' : 'site_id' , 'class' : 'Site' , 'table' : 'unused-on-direct-refs' } ,
- ]
def validate_hostname(self, hostname):
if not valid_hostname(hostname):
" where node_id = %d" % (self['node_id']) )
self.sync(commit)
- def associate_nodenetworks(self, auth, field, value):
+ def associate_interfaces(self, auth, field, value):
"""
- Delete nodenetworks not found in value list (using DeleteNodeNetwor)k
- Add nodenetworks found in value list (using AddNodeNetwork)
- Updates nodenetworks found w/ nodenetwork_id in value list (using UpdateNodeNetwork)
+ Delete interfaces not found in value list (using DeleteInterface)
+ Add interfaces found in value list (using AddInterface)
+ Updates interfaces found w/ interface_id in value list (using UpdateInterface)
"""
- assert 'nodenetworkp_ids' in self
+ assert 'interface_ids' in self
assert 'node_id' in self
assert isinstance(value, list)
- (nodenetwork_ids, blank, nodenetworks) = self.separate_types(value)
-
- if self['nodenetwork_ids'] != nodenetwork_ids:
- from PLC.Methods.DeleteNodeNetwork import DeleteNodeNetwork
-
- stale_nodenetworks = set(self['nodenetwork_ids']).difference(nodenetwork_ids)
+ (interface_ids, blank, interfaces) = self.separate_types(value)
- for stale_nodenetwork in stale_nodenetworks:
- DeleteNodeNetwork.__call__(DeleteNodeNetwork(self.api), auth, stale_nodenetwork['nodenetwork_id'])
-
- def associate_nodegroups(self, auth, field, value):
- """
- Add node to nodegroups found in value list (AddNodeToNodegroup)
- Delete node from nodegroup not found in value list (DeleteNodeFromNodegroup)
- """
-
- from PLC.NodeGroups import NodeGroups
-
- assert 'nodegroup_ids' in self
- assert 'node_id' in self
- assert isinstance(value, list)
+ if self['interface_ids'] != interface_ids:
+ from PLC.Methods.DeleteInterface import DeleteInterface
- (nodegroup_ids, nodegroup_names) = self.separate_types(value)[0:2]
-
- if nodegroup_names:
- nodegroups = NodeGroups(self.api, nodegroup_names, ['nodegroup_id']).dict('nodegroup_id')
- nodegroup_ids += nodegroups.keys()
+ stale_interfaces = set(self['interface_ids']).difference(interface_ids)
- if self['nodegroup_ids'] != nodegroup_ids:
- from PLC.Methods.AddNodeToNodeGroup import AddNodeToNodeGroup
- from PLC.Methods.DeleteNodeFromNodeGroup import DeleteNodeFromNodeGroup
-
- new_nodegroups = set(nodegroup_ids).difference(self['nodegroup_ids'])
- stale_nodegroups = set(self['nodegroup_ids']).difference(nodegroup_ids)
-
- for new_nodegroup in new_nodegroups:
- AddNodeToNodeGroup.__call__(AddNodeToNodeGroup(self.api), auth, self['node_id'], new_nodegroup)
- for stale_nodegroup in stale_nodegroups:
- DeleteNodeFromNodeGroup.__call__(DeleteNodeFromNodeGroup(self.api), auth, self['node_id'], stale_nodegroup)
-
+ for stale_interface in stale_interfaces:
+ DeleteInterface.__call__(DeleteInterface(self.api), auth, stale_interface['interface_id'])
-
def associate_conf_files(self, auth, field, value):
"""
Add conf_files found in value list (AddConfFileToNode)
for stale_conf_file in stale_conf_files:
DeleteConfFileFromNode.__call__(DeleteConfFileFromNode(self.api), auth, stale_conf_file, self['node_id'])
-
def associate_slices(self, auth, field, value):
"""
Add slices found in value list to (AddSliceToNode)
"""
assert 'node_id' in self
- assert 'nodenetwork_ids' in self
+ assert 'interface_ids' in self
- # we need to clean up NodeNetworkSettings, so handling nodenetworks as part of join_tables does not work
- for nodenetwork in NodeNetworks(self.api,self['nodenetwork_ids']):
- nodenetwork.delete()
+ # we need to clean up InterfaceSettings, so handling interfaces as part of join_tables does not work
+ for interface in Interfaces(self.api,self['interface_ids']):
+ interface.delete()
# Clean up miscellaneous join tables
for table in self.join_tables: