ChangeLogTag: Thu Feb 22 02:30:29 UTC 2007 Jaiganesh B <jai.dre.vanderbilt.edu>

2 files changed, 37 insertions, 1 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 84a7849aa3a..55c637c6769 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb 22 02:30:29 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * DAnCE/Deployment/CIAO_ServerResources.idl:
+        
+          Modified the IDL to conform to the changes made in the
+          schema.
+
 Thu Feb 22 02:27:00 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
 
         * tools/Config_Handlers/RT-CCM/CNPM_Handler.h:
diff --git a/CIAO/DAnCE/Deployment/CIAO_ServerResources.idl b/CIAO/DAnCE/Deployment/CIAO_ServerResources.idl
index de14402f835..75eb8880d07 100644
--- a/CIAO/DAnCE/Deployment/CIAO_ServerResources.idl
+++ b/CIAO/DAnCE/Deployment/CIAO_ServerResources.idl
@@ -151,11 +151,13 @@ module CIAO
     /**
      * @brief PolicyType supported by DAnCE extension.  Again, we are
      * redefining these value to avoid dependencies to various ORB
-     * modules such as RTCORBA.
+     * modules such as RTCORBA and DiffServ policy libraries.
      */
     const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40;
     const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41;
     const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45;
+    const CORBA::PolicyType CLIENT_NETWORK_PRIORITY_TYPE = 86;
+    const CORBA::PolicyType NETWORK_PRIORITY_TYPE = 87;
 
     enum PriorityModel
       {
@@ -163,6 +165,12 @@ module CIAO
         SERVER_DECLARED
       };
 
+    enum NWPriorityModel
+      {
+        CLIENT_PROPAGATED_NWPRIORITY,
+        SERVER_DECLARED_NWPRIORITY
+      };
+
     /**
      * @brief Defines data required for creating a PriorityModel Policy
      */
@@ -173,6 +181,25 @@ module CIAO
     };
 
     /**
+     * @brief Defines data required for creating a server side DiffServ policy
+     */
+    struct NWPriorityModelPolicyDef
+    {
+      NWPriorityModel nw_priority_model;
+      long request_dscp;
+      long reply_dscp;
+    };
+
+    /**
+     * @brief Defines data required for creating a client side DiffServ policy
+     */
+    struct CNWPriorityModelPolicyDef
+    {
+      long request_dscp;
+      long reply_dscp;
+    };
+
+    /**
      * @brief Define data required for creating a Threadpool policy
      */
     struct ThreadpoolPolicyDef
@@ -196,6 +223,8 @@ module CIAO
     case 40: PriorityModelPolicyDef PriorityModelDef;
     case 41: ThreadpoolPolicyDef    ThreadpoolDef;
     case 45: PriorityBandedConnectionPolicyDef PriorityBandedConnectionDef;
+    case 86: CNWPriorityModelPolicyDef CNWPriorityModelDef;
+    case 87: NWPriorityModelPolicyDef NWPriorityModelDef;
     };
 
     /**