Commit 8631118c authored by Russ Fish's avatar Russ Fish

Move newosid args into formfields.

parent ed783338
......@@ -409,26 +409,27 @@ new_nodetype:
os1 = testosid
new_osid:
$(call wget_post,,newosid.php3,newosid.html,\
pid=$(proj1)\
osname=$(os1)\
os_feature_isup=checked\
os_magic=\
os_path=\
os_version=666\
nextosid=\
os_feature_veths=checked\
os_feature_ping=checked\
os_feature_ipod=checked\
OS=FreeBSD\
os_feature_linktest=checked\
os_feature_mlinks=checked\
os_clean=Yep\
op_mode=NORMALv2\
description=Test OS description.\
os_reboot_waittime=150\
os_shared=Yep\
os_feature_linkdelays=checked\
os_feature_ssh=checked)
formfields[pid]=$(proj1)\
formfields[osname]=$(os1)\
formfields[os_feature_isup]=checked\
formfields[magic]=\
formfields[path]=\
formfields[version]=666\
formfields[nextosid]=\
formfields[os_feature_veths]=checked\
formfields[os_feature_ping]=checked\
formfields[os_feature_ipod]=checked\
formfields[OS]=FreeBSD\
formfields[os_feature_linktest]=checked\
formfields[os_feature_mlinks]=checked\
formfields[mustclean]=Yep\
formfields[op_mode]=NORMALv2\
formfields[description]=Test OS description.\
formfields[reboot_waittime]=150\
formfields[shared]=Yep\
formfields[os_feature_linkdelays]=checked\
formfields[os_feature_ssh]=checked\
submit=Submit)
os1_osid_sql = $(call boss_sql, \
select osid from os_info where pid='$(proj1)' and osname='$(os1)')
show_os1_osid:
......
......@@ -118,7 +118,7 @@ See README-FIRST.txt for a top-level outline.
failure occurs, the make stops. This is a Good Thing, because there
are a lot of dependencies in the activation sequence. Most early
objects must exist for later ones to be created. When UNKNOWN results
occur, browse to the file and update the patterns.
occur, browse to the file to see what was returned and update the patterns.
- You can browse to the .html files using File/Open, or pop up pages in
your browser directly from Emacs using this handy keyboard macro:
......@@ -139,6 +139,9 @@ See README-FIRST.txt for a top-level outline.
is in buffer "d". Put the cursor on a filename line in an analyze*.txt
file and type ^C-^F to pop up the page in the current Opera tab.
Notice that if the resulting .html file contains a javascript PageReplace,
you will need to comment that out to see what was returned by PHP.
- Debugging: You can gmake individual activation tasks when things are
broken, working through the sequence by hand. The actions should
handle the dance of logging in and out and toggling admin privileges.
......@@ -198,12 +201,17 @@ See README-FIRST.txt for a top-level outline.
- This is automatic, but there are a few little special cases in the
makefile. It leads into iterating on the input_values.list dictionary.
See the comments in README-concepts.txt .
See the comments about this in README-concepts.txt .
- Input is the spidered public.wget and admin.wget subtrees.
- Output is $twsr/site_inputs.list and $twsr/input_names.list, which
isn't used directly, but is used for adding to $tws/input_values.list .
- Output is $twsr/site_inputs.list and $twsr/input_names.list .
. When the inputs to a form change (fields, names, or defaults) you can
edit site_inputs.list rather than having to do another whole spider run.
. input_names.list isn't used directly, but is a source for copying strings
to add to the $tws/input_values.list control file.
See the comments in $twsr/forms-to-urls.gawk about features controlled
by special annotations on the input_values.list entries.
......
......@@ -53,3 +53,4 @@ does not have enough permission
Could not map page arguments
Undefined variable
No running delay nodes
Transient error
......@@ -40,10 +40,12 @@ name="formfields[mtype_pc600]" !Yep
name="formfields[mtype_pc850]" !Yep
name="formfields[mtype_pc3000]" !Yep
name="formfields[new_section]" test_section
name="formfields[nextosid]" !
name="formfields[noidleswap_reason]" Testing.
name="formfields[node_id]" !
name="formfields[op_mode]" NORMALv2
name="formfields[os_name]" FreeBSD
name="formfields[OS]" FreeBSD
name="formfields[osname]" testosid
name="formfields[os_version]" 666
name="formfields[part1_osid]" !$osidx
name="formfields[password1]" EinE_tmp
......
......@@ -14502,26 +14502,26 @@
./myboss.vulnelab.testbed.emulab.net/newosid_form.php3
<form action="https://myboss.vulnelab.testbed.emulab.net/newosid.php3" method="post" name=idform>
<input type="select" name="project" value=''>
<input type="text" name="osname" size=20 maxlength=20>
<input type="text" name="description" size="40">
<input type="select" name="OS" value="Linux" >
<input type="text" name="os_version" size=12 maxlength=12>
<input type="text" name="os_path" size=40>
<input type="text" name="os_magic" size=30>
<input type="checkbox" name="os_feature_ping" value="checked" checked >
<input type="checkbox" name="os_feature_ssh" value="checked" checked >
<input type="checkbox" name="os_feature_ipod" value="checked" checked >
<input type="checkbox" name="os_feature_isup" value="checked" checked >
<input type="checkbox" name="os_feature_veths" value="checked" checked >
<input type="checkbox" name="os_feature_mlinks" value="checked" checked >
<input type="checkbox" name="os_feature_linktest" value="checked" checked >
<input type="checkbox" name="os_feature_linkdelays" value="checked" checked >
<input type="select" name="op_mode" value="NORMALv2" >
<input type="checkbox" name="os_shared" value="Yep" >
<input type="checkbox" name="os_clean" value="Yep" >
<input type="text" name="os_reboot_waittime" size=5>
<input type="select" name="nextosid" value="X" >
<input type="select" name="formfields[pid]" value=''>
<input type="text" name="formfields[osname]" size=20 maxlength=20>
<input type="text" name="formfields[description]" size="40">
<input type="select" name="formfields[OS]" value="Linux" >
<input type="text" name="formfields[version]" size=12 maxlength=12>
<input type="text" name="formfields[path]" size=40>
<input type="text" name="formfields[magic]" size=30>
<input type="checkbox" name="formfields[os_feature_ping]" value="checked" checked >
<input type="checkbox" name="formfields[os_feature_ssh]" value="checked" checked >
<input type="checkbox" name="formfields[os_feature_ipod]" value="checked" checked >
<input type="checkbox" name="formfields[os_feature_isup]" value="checked" checked >
<input type="checkbox" name="formfields[os_feature_veths]" value="checked" checked >
<input type="checkbox" name="formfields[os_feature_mlinks]" value="checked" checked >
<input type="checkbox" name="formfields[os_feature_linktest]" value="checked" checked >
<input type="checkbox" name="formfields[os_feature_linkdelays]" value="checked" checked >
<input type="select" name="formfields[op_mode]" value="NORMALv2" >
<input type="checkbox" name="formfields[shared]" value="Yep" >
<input type="checkbox" name="formfields[mustclean]" value="Yep" >
<input type="text" name="formfields[reboot_waittime]" size=5>
<input type="select" name="formfields[nextosid]" value="X" >
<input type="submit" value="Submit" >
./myboss.vulnelab.testbed.emulab.net/newproject.php3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment