[Swift-commit] r6435 - branches/faster/resources
hategan at ci.uchicago.edu
hategan at ci.uchicago.edu
Sat Apr 13 20:12:14 CDT 2013
Author: hategan
Date: 2013-04-13 20:12:13 -0500 (Sat, 13 Apr 2013)
New Revision: 6435
Modified:
branches/faster/resources/swift-sites-1.0.xsd
Log:
updated sites schema
Modified: branches/faster/resources/swift-sites-1.0.xsd
===================================================================
--- branches/faster/resources/swift-sites-1.0.xsd 2013-04-13 04:46:24 UTC (rev 6434)
+++ branches/faster/resources/swift-sites-1.0.xsd 2013-04-14 01:12:13 UTC (rev 6435)
@@ -21,135 +21,190 @@
<xs:attribute name="minor" type="xs:nonNegativeInteger" use="required"/>
<xs:attribute name="patch" type="xs:nonNegativeInteger" use="optional"/>
</xs:attributeGroup>
+ <xs:simpleType name="OSType">
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="INTEL32::LINUX"/>
+ <xs:enumeration value="INTEL64::LINUX"/>
+ <xs:enumeration value="INTEL32::WINDOWS"/>
+ <xs:enumeration value="INTEL64::WINDOWS"/>
+ <xs:enumeration value="INTEL32::GENERIC_UNIX"/>
+ <xs:enumeration value="INTEL64::GENERIC_UNIX"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:element name="config">
<xs:annotation>
- <xs:documentation>root element aggregating all pool information there is.</xs:documentation>
+ <xs:documentation>root element aggregating all sites information there is.</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence maxOccurs="unbounded">
<xs:element name="pool">
<xs:annotation>
- <xs:documentation>Describes a singl
e pool.</xs:documentation>
+ <xs:documentation>Describes a single site.</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
- <xs:element name="profile" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Administrative profile defaults associated with a pool.</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="namespace" type="ProfileNamespace" use="required"/>
- <xs:attribute name="key" type="xs:string" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="lrc" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Each pool may report to multiple LRCs.</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute
name="url" type="xs:anyURI" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="gridftp" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Each pool may have multiple gridftp servers.</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="bandwidth" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Stores the bandwidth informaion related to each gridftp server.</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="dest-subnet" type="xs:string" use="required"/>
- <xs:attribute name="avg-bandwidth" type="xs:float" use="required"/>
- <xs:attribute name="max-bandwidth" type="xs:float" use="required"/>
- <xs:attribute name="min-bandwidth" type="xs:float" use="required"/>
- <xs:attribute name="avg-bandwid
th-range1" type="xs:float" use="optional"/>
- <xs:attribute name="avg-bandwidth-range2" type="xs:float" use="optional"/>
- <xs:attribute name="avg-bandwidth-range3" type="xs:float" use="optional"/>
- <xs:attribute name="avg-bandwidth-range4" type="xs:float" use="optional"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="url" type="xs:anyURI" use="required">
- <xs:annotation>
- <xs:documentation>The URL (actually, it may be more a URI, but hey, so what) is the access URL to the gridftp server. Each pool may have multiple gridftp servers, or run multiple versions of Globus on different ports.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="storage" type="xs:string" use="optional" default="/">
- <xs:annotation>
- <xs:documentation>This element is the storage mount point prefix. Of course, thi
s may get turned over into other things, augmented by user and system requirements etc. I believe that default works quite well for default Globus setups. </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attributeGroup ref="GlobusVersionInfo"/>
- <xs:attribute name="total-size" type="xs:decimal" use="optional"/>
- <xs:attribute name="free-size" type="xs:decimal" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="jobmanager" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Each pool supports various (usually two) jobmanagers.</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="universe" type="xs:token" use="required">
- <xs:annotation>
- <xs:documentation>The universe name is actually the primary key for the jobmanager identification.</xs:documentation>
- </xs:annotation>
-
</xs:attribute>
- <xs:attribute name="url" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>The contact string is the secondary key for any job manager.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attributeGroup ref="GlobusVersionInfo">
- <xs:annotation>
- <xs:documentation>Any pool may have multiple versions of Globus installed, and these versions may have multiple jobmanagers listening on different ports.</xs:documentation>
- </xs:annotation>
- </xs:attributeGroup>
- <xs:attribute name="free-mem" type="xs:string" use="optional"/>
- <xs:attribute name="total-mem" type="xs:string" use="optional"/>
- <xs:attribute name="max-count" type="xs:string" use="optional"/>
- <xs:attribute name="max-cpu-time" type="xs:string" use="optional"/>
- <xs:attribute name="running-jobs" type="xs:nonNegativeInteger" use="option
al"/>
- <xs:attribute name="jobs-in-queue" type="xs:nonNegativeInteger" use="optional"/>
- <xs:attribute name="idle-nodes" type="xs:nonNegativeInteger" use="optional"/>
- <xs:attribute name="total-nodes" type="xs:nonNegativeInteger" use="optional"/>
- <xs:attribute name="os" type="xs:string" use="optional"/>
- <xs:attribute name="arch" type="xs:string" use="optional"/>
- <xs:attribute name="type" type="xs:string" use="optional"/>
- <xs:attribute name="subnet" type="xs:string" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="workdirectory" default="/tmp">
- <xs:annotation>
- <xs:documentation>Each pool may have one and only one work directory mount point.</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="total-size" type="xs:decimal" use="op
tional"/>
- <xs:attribute name="free-size" type="xs:decimal" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
+ <xs:element ref="profile" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="workdirectory"/>
+ <xs:element ref="execution" minOccurs="1" maxOccurs="1"/>
+ <xs:element ref="filesystem" minOccurs="1" maxOccurs="1"/>
+ <xs:element ref="gridftp" maxOccurs="unbounded"/>
+ <xs:element ref="jobmanager" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="handle" type="xs:ID" use="required"/>
- <xs:attribute name="gridlaunch" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>This is the path to grid launch. As attributes are optional, each pool can have at most one grid launch path. More does not make sense, unless there are different launchers for different remote schedulers, and a pool su
pports more than two (fork + one other) remote schedulers. </xs:documentation>
- </xs:annotation>
- </xs:attribute>
<xs:attribute name="sysinfo" type="xs:string" use="optional" default="INTEL32::LINUX"/>
+
</xs:complexType>
</xs:element>
+
+ <xs:element name="site">
+ <xs:annotation>
+ <xs:documentation>Describes a single site.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="profile" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="workdirectory"/>
+ <xs:element ref="execution" minOccurs="1" maxOccurs="1"/>
+ <xs:element ref="filesystem" minOccurs="1" maxOccurs="1"/>
+ <xs:element ref="application" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="OS" type="OSType" use="optional" default="INTEL32::LINUX"/>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
- <xs:attribute name="version" type="xs:decimal" use="optional" default="1.0"/>
+ <xs:attribute name="version" type="xs:decimal" use="optional" default="2.0"/>
</xs:complexType>
</xs:element>
+ <xs:element name="profile">
+ <xs:annotation>
+ <xs:documentation>Administrative profile defaults associated with a pool.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="namespace" type="ProfileNamespace" use="required"/>
+ <xs:attribute name="key" type="xs:string" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="workdirectory" default="/tmp">
+ <xs:annotation>
+ <xs:documentation>Each pool may have one and only one work directory mount point.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+
<xs:attribute name="total-size" type="xs:decimal" use="optional"/>
+ <xs:attribute name="free-size" type="xs:decimal" use="optional"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="execution">
+ <xs:annotation>
+ <xs:documentation>Describes the mechanism used to submit jobs to the pool</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:attribute name="provider" type="xs:string" use="required"/>
+ <xs:attribute name="jobManager" type="xs:string" use="optional"/>
+ <xs:attribute name="url" type="xs:string" use="optional" default="localhost"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="filesystem">
+ <xs:annotation>
+ <xs:documentation>Describes the mechanism used to interact with the filesystem on the given pool</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:attribute name="provider" type="xs:string" use="required"/>
+ <xs:attribute name="jobManager"
type="xs:string" use="optional"/>
+ <xs:attribute name="url" type="xs:string" use="optional" default="localhost"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="gridftp">
+ <xs:annotation>
+ <xs:documentation>Each pool may have multiple gridftp servers.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="bandwidth" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>Stores the bandwidth informaion related to each gridftp server.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:attribute name="dest-subnet" type="xs:string" use="required"/>
+ <xs:attribute name="avg-bandwidth" type="xs:float" use="required"/>
+ <xs:attribute name="max-bandwidth" type="xs:float" use="required"/>
+ <xs:attribute name="min-bandwidth" type="xs:float" use="required"/>
+ <xs:attribute name="avg-bandwidth-range1" type="xs:float" use="optional"/>
+ <xs:
attribute name="avg-bandwidth-range2" type="xs:float" use="optional"/>
+ <xs:attribute name="avg-bandwidth-range3" type="xs:float" use="optional"/>
+ <xs:attribute name="avg-bandwidth-range4" type="xs:float" use="optional"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="url" type="xs:anyURI" use="required">
+ <xs:annotation>
+ <xs:documentation>The URL (actually, it may be more a URI, but hey, so what) is the access URL to the gridftp server. Each pool may have multiple gridftp servers, or run multiple versions of Globus on different ports.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="storage" type="xs:string" use="optional" default="/">
+ <xs:annotation>
+ <xs:documentation>This element is the storage mount point prefix. Of course, this may get turned over into other things, augmented by user and system requirements etc. I believe that default works quite well for default
Globus setups. </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attributeGroup ref="GlobusVersionInfo"/>
+ <xs:attribute name="total-size" type="xs:decimal" use="optional"/>
+ <xs:attribute name="free-size" type="xs:decimal" use="optional"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="jobmanager">
+ <xs:annotation>
+ <xs:documentation>Each pool supports various (usually two) jobmanagers.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:attribute name="universe" type="xs:token" use="required">
+ <xs:annotation>
+ <xs:documentation>The universe name is actually the primary key for the jobmanager identification.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="url" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>The contact string is the secondary key for any job manager.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribu
teGroup ref="GlobusVersionInfo">
+ <xs:annotation>
+ <xs:documentation>Any pool may have multiple versions of Globus installed, and these versions may have multiple jobmanagers listening on different ports.</xs:documentation>
+ </xs:annotation>
+ </xs:attributeGroup>
+ <xs:attribute name="free-mem" type="xs:string" use="optional"/>
+ <xs:attribute name="total-mem" type="xs:string" use="optional"/>
+ <xs:attribute name="max-count" type="xs:string" use="optional"/>
+ <xs:attribute name="max-cpu-time" type="xs:string" use="optional"/>
+ <xs:attribute name="running-jobs" type="xs:nonNegativeInteger" use="optional"/>
+ <xs:attribute name="jobs-in-queue" type="xs:nonNegativeInteger" use="optional"/>
+ <xs:attribute name="idle-nodes" type="xs:nonNegativeInteger" use="optional"/>
+ <xs:attribute name="total-nodes" type="xs:nonNegativeInteger" use="optional"/>
+ <xs:attribute name="os" type="xs:string" use="optional"/>
+ <xs:attribute name="arch" type=
"xs:string" use="optional"/>
+ <xs:attribute name="type" type="xs:string" use="optional"/>
+ <xs:attribute name="subnet" type="xs:string" use="optional"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="application">
+ <xs:annotation>
+ <xs:documentation>Specifies the details of an application installed on a site</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="profile" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="executable" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
</xs:schema>
\ No newline at end of file
More information about the Swift-commit
mailing list