def nodes(options,index):
return [{'name':'node%d'%index,
- 'node_fields': {'hostname': 'deferred-nodename%d'%index,
- 'model':'qemu/minhw', } ,
+ 'node_fields': {'hostname': 'deferred-nodename%d'%index,
+ 'model':'qemu/minhw', } ,
'host_box': 'deferred-node-hostbox-%d'%index,
'owner' : 'pi',
'nodegroups' : 'mynodegroup',
- 'interface_fields': { 'method':'static',
- 'type':'ipv4',
- 'ip':'xxx-deferred-xxx',
- 'gateway':'xxx-deferred-xxx',
- 'network':'xxx-deferred-xxx',
- 'broadcast':'xxx-deferred-xxx',
- 'netmask':'xxx-deferred-xxx',
- 'dns1': 'xxx-deferred-xxx',
- 'dns2': 'xxx-deferred-xxx',
- },
+ 'interface_fields': { 'method':'static',
+ 'type':'ipv4',
+ 'ip':'xxx-deferred-xxx',
+ 'gateway':'xxx-deferred-xxx',
+ 'network':'xxx-deferred-xxx',
+ 'broadcast':'xxx-deferred-xxx',
+ 'netmask':'xxx-deferred-xxx',
+ 'dns1': 'xxx-deferred-xxx',
+ 'dns2': 'xxx-deferred-xxx',
+ },
+ ######## how to deal with the new plcapi way of modeling interfaces
+ # this pertains to the node as per the new interface - using UpdateNode
+ # after node_fields above is used to create the Node
+ 'node_fields_nint' : { 'dns':'xxx-deferred-xxx',
+ },
+ # used in replacement of interface_fields above
+ 'interface_fields_nint' : { 'is_primary' : True,
+ 'method' : 'static',
+ },
+ # used to create an IpAddress
+ 'ipaddress_fields' : { 'type' : 'ipv4',
+ 'ip_addr' : 'xxx-deferred-xxx',
+ 'netmask' : 'xxx-deferred-xxx',
+ } ,
+ # used to create a Route
+ 'route_fields' : { 'subnet' : '0.0.0.0/0',
+ 'next_hop' : 'xxx-deferred-xxx',
+ },
}]
def all_nodenames (options,index):
'leases' : leases (options, index),
}
+# NOTE: SFA currently has SFA_AGGREGATE_API_VERSION=2 baked into the code
def sfa (options,index) :
return {
# the default is to use AMs in the various aggregates.xml
'SFA_PLC_URL' : 'deferred-myplc-api-url',
'SFA_PLC_USER' : 'root@test.onelab.eu',
'SFA_PLC_PASSWORD' : 'test++',
-# use -c apiv2 to override this one
-# 'SFA_AGGREGATE_API_VERSION' : 1,
+# use -c sfadebug to increment this one
'SFA_API_LOGLEVEL': 1,
# details of the slices to create
'sfa_slice_specs' : [ sfa_slice_spec(options,index,rspec_style)
hrn=prefix+'.'+slicename
user_hrn=prefix+'.'+regularuser
pi_hrn=prefix+'.'+piuser
- slice_record_xml = '''<record hrn="%s" type="slice" description="SFA-testing" url="http://test.onelab.eu/">
-<researcher>%s</researcher>
-</record>'''%(hrn, user_hrn)
-
- mail="%s@%s"%(regularuser,domain)
- print 'in sfa_slice_spec','slicename',slicename,'hrn',hrn,'mail',mail
key=public_key2
- person_record_xml ='''<record email="%(mail)s" enabled="True" first_name="Fake" hrn="%(user_hrn)s"
-last_name="Sfa %(rspec_style)s" name="%(hrn)s" type="user">
+ mail="%s@%s"%(regularuser,domain)
+ person_record_xml =\
+'''<record hrn="%(user_hrn)s" type="user" email="%(mail)s" enabled="True"
+first_name="Fake" last_name="Sfa style=%(rspec_style)s" >
<keys>%(key)s</keys>
-<role_ids>20</role_ids><role_ids>10</role_ids>
-<roles>pi</roles><roles>admin</roles>
-<site_ids>1</site_ids>
-<sites>%(prefix)s</sites>
+<roles>user</roles>
+<roles>tech</roles>
</record>'''%locals()
+ slice_record_xml =\
+'''<record hrn="%s" type="slice" description="SFA-testing" url="http://test.onelab.eu/">
+<researcher>%s</researcher>
+</record>'''%(hrn, user_hrn)
+
return { 'slice_fields': {'name':'%s_%s'%(the_login_base,slicename),
'url':'http://foo%d@foo.com'%index,