diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | common/OpString.idl | 49 |
2 files changed, 49 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index f0764f22cc7..d95df520173 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Oct 25 22:27:20 UTC 2006 John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu> + + * common/OpString.idl: Added Goal IDL structure. + Fri Oct 13 15:52:30 UTC 2006 John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu> * SA_POP/Builder.h diff --git a/common/OpString.idl b/common/OpString.idl index ebdcd86e77e..f139055ce97 100644 --- a/common/OpString.idl +++ b/common/OpString.idl @@ -29,26 +29,33 @@ module CIAO { string UUID; + // Human-readable name (for debugging, not identification). string name; + // Node to which instance is deployed. string node; + // ID of task performed by instance (in Task Network). string taskId; + // Supported type ID of task (in Repository Manager). string taskTypeId; + // Specific type ID of suggested component (in Repository Manager). string suggestedImpl; + // Initial values of component configuration parameters. ::Deployment::Properties configProperty; + // Expected time range of instance start. TimeWindow startWindow; + // Expected time range of instance finish. TimeWindow endWindow; }; typedef sequence <InstanceDescription> InstanceDescriptions; - typedef ::Deployment::PlanConnectionDescriptions DataLinkDescriptions; enum ConnectionType @@ -107,13 +114,49 @@ module CIAO typedef sequence <QoSSpecification> QoSSpecifications; - struct OperationalString + struct GoalCondition + { + int condID; + + int utility; + }; + + typedef sequence <GoalCondition> GoalConditions; + + struct TimeConstraint { + int condID; + + TimeValue timeConstraint; + }; + + typedef sequence <TimeConstraint> TimeConstraints; + + struct Goal + { + string name; + + string UUID; + + GoalConditions goalConds; + + TimeConstraints relativeTimeConstraints; + + TimeConstraints absoluteTimeConstraints; + + QoSSpecifications QoSRequirements; + + TimeWindow startWindow; + }; + struct OperationalString + { string name; string UUID; + Goal goal; + InstanceDescriptions instances; DataLinkDescriptions dataLinks; @@ -129,10 +172,8 @@ module CIAO TimeWindow endWindow; ::Deployment::Properties properties; - }; - }; }; |