From ea3973be83d1d6696e9d11e71b4796deccdac524 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 8 Apr 2008 18:13:32 +0000 Subject: [PATCH] changed 'plc' attribute to plural 'plcs'. Some object may belong to more than 1 plc --- qaapi/qa/Nodes.py | 3 ++- qaapi/qa/Persons.py | 2 +- qaapi/qa/Sites.py | 2 +- qaapi/qa/Slices.py | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/qaapi/qa/Nodes.py b/qaapi/qa/Nodes.py index 8817d4a..379f14a 100644 --- a/qaapi/qa/Nodes.py +++ b/qaapi/qa/Nodes.py @@ -7,12 +7,13 @@ from Table import Table class Node(dict, Remote): fields = { - 'plc': None, + 'plcs': ['TestPLC'], 'hostname': None, # Node Hostname 'host': 'localhost', # host where node lives 'redir_port': None, # Port on host where ssh is redirected to virtual node 'vserver': None, # vserver where this node lives 'type': 'vm', # type of node + 'model': '/minhw', 'nodenetworks': [], # node networks 'homedir': '/var/VirtualMachines/', 'rootkey': None # path to root ssh key diff --git a/qaapi/qa/Persons.py b/qaapi/qa/Persons.py index 8012a1e..2fe2592 100644 --- a/qaapi/qa/Persons.py +++ b/qaapi/qa/Persons.py @@ -4,7 +4,7 @@ from Table import Table class Person(dict): fields = { - 'plc': None, + 'plcs': ['TestPLC'], 'first_name': None, 'last_name': None, 'password': None, diff --git a/qaapi/qa/Sites.py b/qaapi/qa/Sites.py index 406895b..0f441c7 100644 --- a/qaapi/qa/Sites.py +++ b/qaapi/qa/Sites.py @@ -4,7 +4,7 @@ from Table import Table class Site(dict): fields = { - 'plc': 'TestPLC', + 'plcs': ['TestPLC'], 'name': None, 'login_base': None, 'enabled': True, diff --git a/qaapi/qa/Slices.py b/qaapi/qa/Slices.py index 60b78ec..182fdca 100644 --- a/qaapi/qa/Slices.py +++ b/qaapi/qa/Slices.py @@ -1,10 +1,11 @@ import os +from Remote import Remote from Table import Table -class Slice(dict): +class Slice(dict, Remote): fields = { - 'plc': None, + 'plcs': ['TestPLC'], 'name': None, 'instantiation': 'plc-instantiated', 'max_nodes': 1000, -- 2.45.2