Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
c6337a0e
Commit
c6337a0e
authored
Jun 17, 2011
by
Jonathon Duerig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add delay node schema to build system.
parent
ebcd65ce
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
1 deletion
+53
-1
protogeni/rspec/ext/delay/1/request.rnc
protogeni/rspec/ext/delay/1/request.rnc
+1
-1
protogeni/rspec/ext/delay/1/request.xsd
protogeni/rspec/ext/delay/1/request.xsd
+43
-0
protogeni/rspec/xsdgen
protogeni/rspec/xsdgen
+9
-0
No files found.
protogeni/rspec/ext/delay/1/request.rnc
View file @
c6337a0e
...
...
@@ -58,7 +58,7 @@ PipeContents =
attribute linterm { xsd:int }? &
# Lambda in EWMA for determining average queue size [Default: 0.002]
attribute q_weight { xsd:float }?
&
attribute q_weight { xsd:float }?
# Both of the above are start elements.
start = SliverType
protogeni/rspec/ext/delay/1/request.xsd
0 → 100644
View file @
c6337a0e
<?xml version="1.0" encoding="UTF-8"?>
<!--
Extension for the "delay" type in RSpecV2
Version 1
-->
<xs:schema
xmlns:xs=
"http://www.w3.org/2001/XMLSchema"
elementFormDefault=
"qualified"
targetNamespace=
"http://www.protogeni.net/resources/rspec/ext/delay/1"
xmlns:delay=
"http://www.protogeni.net/resources/rspec/ext/delay/1"
>
<!-- Extend SliverType with shaping information -->
<xs:element
name=
"sliver_type_shaping"
>
<xs:complexType>
<xs:sequence>
<xs:element
minOccurs=
"0"
maxOccurs=
"unbounded"
ref=
"delay:pipe"
/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element
name=
"pipe"
>
<xs:complexType>
<xs:attributeGroup
ref=
"delay:PipeContents"
/>
</xs:complexType>
</xs:element>
<!--
To specify bridging without traffic shaping, a pipe should omit the
capacity, latency, and packet_loss attributes.
Pipes are uni-directional.
-->
<xs:attributeGroup
name=
"PipeContents"
>
<xs:attribute
name=
"source"
use=
"required"
/>
<xs:attribute
name=
"dest"
use=
"required"
/>
<xs:attribute
name=
"capacity"
type=
"xs:int"
/>
<xs:attribute
name=
"latency"
type=
"xs:int"
/>
<xs:attribute
name=
"packet_loss"
type=
"xs:float"
/>
<xs:attribute
name=
"gentle"
type=
"xs:boolean"
/>
<xs:attribute
name=
"red"
type=
"xs:boolean"
/>
<xs:attribute
name=
"queue_in_bytes"
type=
"xs:boolean"
/>
<xs:attribute
name=
"limit"
type=
"xs:int"
/>
<xs:attribute
name=
"maxthresh"
type=
"xs:int"
/>
<xs:attribute
name=
"thresh"
type=
"xs:int"
/>
<xs:attribute
name=
"linterm"
type=
"xs:int"
/>
<xs:attribute
name=
"q_weight"
type=
"xs:float"
/>
</xs:attributeGroup>
<!-- Both of the above are start elements. -->
</xs:schema>
protogeni/rspec/xsdgen
View file @
c6337a0e
...
...
@@ -61,6 +61,15 @@ for path in ext/emulab/1/; do
done
done
for
path
in
ext/delay/1/
;
do
for
schema
in
request
;
do
if
[
-e
${
path
}
/
${
schema
}
.rnc
]
;
then
$TRANGCMD
${
path
}
/
${
schema
}
.rnc
${
path
}
/
${
schema
}
.xsd
sudo
scp
${
path
}
/
${
schema
}
.xsd
${
path
}
/
${
schema
}
.rnc ops.emulab.net:/usr/local/www.geni/data/trac/resources/rspec/
${
path
}
/
fi
done
done
cd
../security
for
path
in
ext/policy/1
;
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment