perfsonar development work

Author: rodriguez
Date: 2006-11-21 11:49:35 -0500 (Tue, 21 Nov 2006)
New Revision: 1769

Modified:
   
branches/ulisseskan/src/org/perfsonar/service/topologyService/TopsDownloadAction.java
Log:
Update the response message

Modified: 
branches/ulisseskan/src/org/perfsonar/service/topologyService/TopsDownloadAction.java
===================================================================
--- 
branches/ulisseskan/src/org/perfsonar/service/topologyService/TopsDownloadAction.java
       2006-11-20 16:50:15 UTC (rev 1768)
+++ 
branches/ulisseskan/src/org/perfsonar/service/topologyService/TopsDownloadAction.java
       2006-11-21 16:49:35 UTC (rev 1769)
@@ -9,10 +9,14 @@
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.Properties;
+import java.util.UUID;
 
 import org.ggf.ns.nmwg.base.v2_0.Data;
+import org.ggf.ns.nmwg.base.v2_0.EventType;
+import org.ggf.ns.nmwg.base.v2_0.Key;
 import org.ggf.ns.nmwg.base.v2_0.Message;
 import org.ggf.ns.nmwg.base.v2_0.Metadata;
+import org.ggf.ns.nmwg.base.v2_0.Parameters;
 import org.ggf.ns.nmwg.topology.base.v3_0.HostName;
 import org.ggf.ns.nmwg.topology.base.v3_0.Node;
 import org.ggf.ns.nmwg.topology.l3.v3_0.Capacity;
@@ -33,6 +37,11 @@
        private static String ROOT_LOG = "TopServiceEngine: ";
        private static String TIME_PARAM = "Time";
        private static String DOMAINID_PARAM = "domain_id";
+       private static String REQUESTID_PARAM = "request_id";
+       private static String SERVERID_PARAM = "id";
+       private static String TTL_PARAM = "ttl";
+       private static String EVENT_TYPE_SUCCESS = "success.tops.downloaddb";
+       private static String EVENT_TYPE_WRONG_PARAMS = 
"error.tops.parameters";
        
        private Properties interfacesDesc;
 
@@ -53,7 +62,26 @@
                throw new SystemException("error.tops.fetching", m);
                }
        }
+       
+       private boolean checkParams(Metadata metadata) {
+               boolean res=false;
+               
+               if 
(metadata.getParameterByName(TIME_PARAM).getParameterValue().equals("now")&&
+                               
metadata.getParameterByName(DOMAINID_PARAM)!=null) {
+                       res=true;
+               }
+               
+               return res;
+       }
 
+       private void fillMetadataResponse(Metadata basicMetadata,Parameters 
params) {
+               if (basicMetadata.getParameterByName(TTL_PARAM)!=null) {
+                       params.addParameter(TTL_PARAM, "0");
+               }
+               params.addParameter(REQUESTID_PARAM, 
UUID.randomUUID().toString());
+               params.addParameter(SERVERID_PARAM, 
basicMetadata.getParameterByName(DOMAINID_PARAM).getParameterValue());
+       }
+       
        @Override
        public Message performAction(Message request) throws SystemException,
                        RequestException, DataFormatException {
@@ -75,8 +103,19 @@
                                }
                        }
                }
-               response.setMetadata(basicMetadata);
-               if 
(basicMetadata.getParameterByName(TIME_PARAM).getParameterValue().equals("now"))
 {
+               // Creating the response metadata
+               Metadata responseMetadata=new Metadata();
+               responseMetadata.setId("metadata_id1");
+               Key key=new Key();
+               responseMetadata.setKey(key);
+               Parameters params=new Parameters();
+               fillMetadataResponse(basicMetadata,params);
+               key.setParameters(params);
+               EventType et=new EventType();
+               responseMetadata.setEventType(et);
+               if (checkParams(basicMetadata)) {
+                       et.setEventType(EVENT_TYPE_SUCCESS);
+
                        String 
domain_id=basicMetadata.getParameterByName(DOMAINID_PARAM).getParameterValue();
                        // Filling data...
                        logger.debug(ROOT_LOG+"creating response data...");
@@ -91,22 +130,11 @@
                        fillNodes(responseData,domain_id);
                        fillNodesNetworks(responseData,domain_id);
                        response.addChild(responseData);
-                       
-                       // Append success result code
-                       logger.debug(ROOT_LOG+"adding result code...");
-                       ResultCode rc = 
createResultCode("success.tops.downloaddb",
-                                       "TopsDownloadDBAction: full download 
of the database successful");
-                       Metadata[] responseMetadata = { rc.getMetadata() };
-                       Data[] resultData = null;
-                       if (rc.getData() != null) {
-                               resultData = new Data[1];
-                               resultData[0] = rc.getData();
-                       }
-                       response.addChild(resultData[0]);
-                       for (int j = 0; j < responseMetadata.length; j++) {
-                               response.addChild(responseMetadata[j]);
-                       }
                }
+               else {
+                       et.setEventType(EVENT_TYPE_WRONG_PARAMS);
+               }
+               response.setMetadata(responseMetadata);
 
                return response;
        }