fix meta data for cloudzone

edisonSu · edisonSu · commit e72fed378229 · 2011-07-08T13:33:05.000-07:00
diff --git a/agent/src/com/cloud/agent/vmdata/JettyVmDataServer.java b/agent/src/com/cloud/agent/vmdata/JettyVmDataServer.java
@@ -108,12 +108,23 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
         
         protected void handleUserData(HttpServletRequest req, HttpServletResponse resp) 
                 throws ServletException, IOException {
+            String metadataItem = req.getPathInfo();
             String requester = req.getRemoteAddr();
             resp.setContentType("text/html");
             resp.setStatus(HttpServletResponse.SC_OK);
-            String userData = _vmDataServer.getVmDataItem(requester, USER_DATA);
-            if (userData != null){
-                resp.getWriter().print(userData);
+            String data = null;
+            if (metadataItem != null) {
+                String[] path = metadataItem.split("/");
+                if (path.length > 1) {
+                    metadataItem = path[1];
+                }
+            }
+          
+            if (metadataItem != null)
+                data = _vmDataServer.getVmDataItem(requester, metadataItem);
+           
+            if (data != null){
+                resp.getWriter().print(data);
             } else {
                 resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
                 resp.sendError(HttpServletResponse.SC_NOT_FOUND, "Request not found");
@@ -249,8 +260,8 @@ private void setupJetty(int vmDataPort, int fileservingPort) throws Exception {
  
         Context root = new Context(_jetty,"/latest",Context.SESSIONS);
         root.setResourceBase(_vmDataDir);
-        root.addServlet(new ServletHolder(new VmDataServlet(this, USER_DATA)), "/user-data");
-        root.addServlet(new ServletHolder(new VmDataServlet(this, META_DATA)), "/meta-data");
+        root.addServlet(new ServletHolder(new VmDataServlet(this, USER_DATA)), "/*");
+       
         
         ResourceHandler resource_handler = new ResourceHandler(); 
         resource_handler.setResourceBase("/var/lib/images/");
@@ -344,5 +355,4 @@ public void handleVmStopped(String vmName) {
         String vmDataDir = _vmDataDir + File.separator + vmName;
         Script.runSimpleBashScript("rm -rf " + vmDataDir);
     }
-
 }
