diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 221bd7d66f8..14e53b64b1b 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1,4 +1,8 @@
 #New - Add all new parameters here.  
+label.network.device=Network Device
+label.add.network.device=Add Network Device
+label.network.device.type=Network Device Type
+label.DHCP.server.type=DHCP Server Type
 
 #Labels
 label.PreSetup=PreSetup
diff --git a/ui/jsp/pod.jsp b/ui/jsp/pod.jsp
index f32c18e6e71..22cd0b301fb 100644
--- a/ui/jsp/pod.jsp
+++ b/ui/jsp/pod.jsp
@@ -31,6 +31,8 @@ dictionary = {
             <fmt:message key="label.details"/></div>
         <div class="content_tabs off" id="tab_ipallocation">
             <fmt:message key="label.ip.allocations"/></div>
+       <div class="content_tabs off" id="tab_networkdevice">
+            <fmt:message key="label.network.device"/></div>   
     </div>
     
     <!-- Details tab (start)-->
@@ -146,6 +148,19 @@ dictionary = {
     </div> 
     <!-- Network tab (end)-->
 
+    <!-- Network Device tab (start)-->
+    <div style="display: none;" id="tab_content_networkdevice">
+    	<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display:none;">
+              <div class="rightpanel_mainloaderbox">
+                   <div class="rightpanel_mainloader_animatedicon"></div>
+                   <p><fmt:message key="label.loading"/> &hellip;</p>    
+              </div>               
+        </div>
+        <div id="tab_container">
+            Network Device....
+        </div>
+    </div> 
+    <!-- Network Device tab (end)-->
 </div>
 
 <!--  top buttons (begin) -->
@@ -186,6 +201,15 @@ dictionary = {
             </div>
         </div>
     </div>
+    <div class="actionpanel_button_wrapper" id="add_network_device_button" style="display: none">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt='<fmt:message key="label.add.network.device"/>' /></div>
+            <div class="actionpanel_button_links">
+                <fmt:message key="label.add.network.device"/>
+            </div>
+        </div>
+    </div>    
 </div>
 <!--  top buttons (end) -->
 
@@ -626,4 +650,66 @@ dictionary = {
     </div>
 </div>
 <!-- Add IP Range to pod (end) -->
+
+<!-- Add Network Device (begin) -->
+<div id="dialog_add_network_device" title='<fmt:message key="label.add.network.device"/>' style="display:none">	
+	<div class="dialog_formcontent">
+		<form action="#" method="post" id="form5">
+			<ol>				    		
+				<li>
+					<label>
+                    <fmt:message key="label.type"/>:</label>
+                    <select class="select" id="network_device_type">                       
+                        <option value="ExternalDhcp">ExternalDhcp</option>
+                        <option value="PxeServer">PxeServer</option>
+                    </select>
+                    <div id="network_device_type_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                    </div>                
+				</li>
+				<li>
+					<label><fmt:message key="label.url"/>:</label>
+					<input class="text" type="text" id="url"/>
+					<div id="url_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>	
+				<li>
+					<label><fmt:message key="label.username"/>:</label>
+					<input class="text" type="text" id="username"/>
+					<div id="username_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>				
+				<li>
+					<label><fmt:message key="label.password"/>:</label>
+					<input class="text" type="password" id="password"/>
+					<div id="password_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li>
+					<label>
+                    <fmt:message key="label.DHCP.server.type"/>:</label>
+                    <select class="select" id="DHCP_server_type">                       
+                        <option value="Dhcpd">Dhcpd</option>
+                        <option value="Dnsmasq">Dnsmasq</option>
+                    </select>
+                    <div id="DHCP_server_type_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                    </div>                
+				</li>
+			</ol>
+		</form>
+	</div>
+	<!--Loading box-->
+    <div id="spinning_wheel" class="ui_dialog_loaderbox" style="display: none;">
+        <div class="ui_dialog_loader">
+        </div>
+        <p>
+            <fmt:message key="label.adding"/>....</p>
+    </div>
+    <!--Confirmation msg box-->
+    <!--Note: for error msg, just have to add error besides everything for eg. add error(class) next to ui_dialog_messagebox error, ui_dialog_msgicon error, ui_dialog_messagebox_text error.  -->
+    <div id="info_container" class="ui_dialog_messagebox error" style="display: none;">
+        <div id="icon" class="ui_dialog_msgicon error">
+        </div>
+        <div id="info" class="ui_dialog_messagebox_text error">
+            (info)</div>
+    </div>
+</div>
+<!-- Add Network Device (end) -->
+
 <!-- ***** dialogs (begin) ***** -->
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index f2602d7d52b..54a00992c8b 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -25,6 +25,7 @@
     initDialog("dialog_add_external_cluster");
     initDialog("dialog_add_host", 400);    
     initDialog("dialog_add_iprange_to_pod");
+    initDialog("dialog_add_network_device");
     
     //add pool dialog
     initDialog("dialog_add_pool", 400);	
@@ -45,9 +46,9 @@
     });   
     
     //switch between different tabs 
-    var tabArray = [$("#tab_details"), $("#tab_ipallocation")];
-    var tabContentArray = [$("#tab_content_details"), $("#tab_content_ipallocation")];
-    var afterSwitchFnArray = [podJsonToDetailsTab, podJsonToNetworkTab];
+    var tabArray = [$("#tab_details"), $("#tab_ipallocation"), $("#tab_networkdevice")];
+    var tabContentArray = [$("#tab_content_details"), $("#tab_content_ipallocation"), $("#tab_content_networkdevice")];
+    var afterSwitchFnArray = [podJsonToDetailsTab, podJsonToNetworkTab, podJsonToNetworkDeviceTab];
     switchBetweenDifferentTabs(tabArray, tabContentArray, afterSwitchFnArray);       
    
     $readonlyFields  = $("#tab_content_details").find("#name, #netmask, #ipRange, #gateway");
@@ -127,11 +128,12 @@ function podJsonToDetailsTab() {
 		}
 	});	
     if(networkType == "Basic") { //basic-mode network (pod-wide VLAN)
-        $("#tab_ipallocation, #add_iprange_button").show();  
+        $("#tab_ipallocation, #add_iprange_button, #add_network_device_button").show();  
         bindAddIpRangeToPodButton($leftmenuItem1);  
+        bindAddNetworkDeviceButton($leftmenuItem1);
     }
     else if(networkType == "Advanced") { //advanced-mode network (zone-wide VLAN)
-        $("#tab_ipallocation, #add_iprange_button").hide();
+    	$("#tab_ipallocation, #add_iprange_button, #add_network_device_button").hide();
         $("#midmenu_add_directIpRange_button").unbind("click").hide();         
     }
     
@@ -139,17 +141,7 @@ function podJsonToDetailsTab() {
     //actions ***   
     var $actionLink = $thisTab.find("#action_link"); 
     bindActionLink($actionLink);
-    /*
-    $actionLink.bind("mouseover", function(event) {	    
-        $(this).find("#action_menu").show();    
-        return false;
-    });
-    $actionLink.bind("mouseout", function(event) {       
-        $(this).find("#action_menu").hide();    
-        return false;
-    });	  
-    */
-    
+        
     var $actionMenu = $actionLink.find("#action_menu");
     $actionMenu.find("#action_list").empty();   
     buildActionLinkForTab("label.action.edit.pod", podActionMap, $actionMenu, $leftmenuItem1, $thisTab);  
@@ -195,11 +187,57 @@ function podJsonToNetworkTab() {
 		}			
 	});			
 } 
+
+
+function podJsonToNetworkDeviceTab() {    
+	var $leftmenuItem1 = $("#right_panel_content").data("$leftmenuItem1");
+    if($leftmenuItem1 == null) {
+        podClearNetworkDeviceTab();
+        return;
+    }
+    
+    var jsonObj = $leftmenuItem1.data("jsonObj");    
+    if(jsonObj == null) {
+        podClearNetworkDeviceTab();
+	    return;	
+	}
+     
+    /*
+    var $thisTab = $("#right_panel_content #tab_content_network_device");
+	$thisTab.find("#tab_container").hide(); 
+    $thisTab.find("#tab_spinning_wheel").show();   		 
+        
+    $.ajax({
+		data: createURL("command=listVlanIpRanges&zoneid="+fromdb(jsonObj.zoneid)+"&podid="+fromdb(jsonObj.id)),
+		dataType: "json",
+		success: function(json) {			       
+			var items = json.listvlaniprangesresponse.vlaniprange;
+			var $container = $thisTab.find("#tab_container").empty();
+			var template = $("#network_tab_template");	
+			if (items != null && items.length > 0) {					    
+				for (var i = 0; i < items.length; i++) {	
+				    var newTemplate = template.clone(true);	               
+	                podNetworkJsonToTemplate(items[i], newTemplate); 
+	                $container.append(newTemplate.show());	
+				}
+			}
+			$thisTab.find("#tab_spinning_wheel").hide();    
+            $thisTab.find("#tab_container").show();    	
+		}			
+	});	
+	*/		
+} 
+
 
 function podClearNetworkTab() {    
     var $thisTab = $("#right_panel_content #tab_content_ipallocation");
 	$thisTab.find("#tab_container").empty();
 } 
+
+function podClearNetworkDeviceTab() {    
+    var $thisTab = $("#right_panel_content #tab_content_network_device");
+	$thisTab.find("#tab_container").empty();
+} 
 
 function podNetworkJsonToTemplate(jsonObj, template) {
     template.data("jsonObj", jsonObj);     
@@ -859,6 +897,72 @@ function bindAddIpRangeToPodButton($leftmenuItem1) {
         return false;
     });             
 }
+
+
+function bindAddNetworkDeviceButton($leftmenuItem1) {       
+    $("#add_network_device_button").unbind("click").bind("click", function(event) {  
+        if($("#tab_content_networkdevice").css("display") == "none")
+            $("#tab_networkdevice").click();    
+            
+        var podObj = $leftmenuItem1.data("jsonObj");               
+        var zoneId = podObj.zoneid;        
+        var podId = podObj.id;
+                             
+        $("#dialog_add_network_device") 
+	    .dialog('option', 'buttons', {
+	        "Add": function() {             
+	            var $thisDialog = $(this);		
+			   				
+				// validate values
+				var isValid = true;	
+				isValid &= validateString("URL", $thisDialog.find("#url"), $thisDialog.find("#url_errormsg"));				
+				isValid &= validateString("Username", $thisDialog.find("#username"), $thisDialog.find("#username_errormsg"));				
+				isValid &= validateString("Password", $thisDialog.find("#password"), $thisDialog.find("#password_errormsg"));				
+				if (!isValid) 
+				    return;							
+				
+				$thisDialog.find("#spinning_wheel").show(); 									
+				
+				var array1 = [];
+				array1.push("&networkdevicetype="+$thisDialog.find("#network_device_type").val());
+				array1.push("&networkdeviceparameterlist[0].zoneid=" + zoneId);
+				array1.push("&networkdeviceparameterlist[0].podId=" + podId);	
+				array1.push("&networkdeviceparameterlist[0].url="+$thisDialog.find("#url").val());	
+				array1.push("&networkdeviceparameterlist[0].username="+$thisDialog.find("#username").val());	
+				array1.push("&networkdeviceparameterlist[0].password="+$thisDialog.find("#password").val());	
+				array1.push("&networkdeviceparameterlist[0].dhcpservertype=" + $thisDialog.find("#DHCP_server_type").val());
+							
+				$.ajax({
+				    data: createURL("command=addNetworkdevice" + array1.join("")),
+					dataType: "json",
+					success: function(json) {						    				    
+					    $thisDialog.find("#spinning_wheel").hide();				        
+				        $thisDialog.dialog("close");
+					    
+					    /*
+					    var item = json.createvlaniprangeresponse.vlan;
+					    var $subgridItem = $("#network_tab_template").clone(true);
+					    podNetworkJsonToTemplate(item, $subgridItem); 	
+					    $subgridItem.find("#after_action_info").text(g_dictionary["label.adding.succeeded"]);
+                        $subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").show();  				                        
+	                    $("#tab_content_ipallocation").find("#tab_container").append($subgridItem.fadeIn("slow"));	
+	                    */
+					},
+				    error: function(XMLHttpResponse) {						        	        				        
+				        handleError(XMLHttpResponse, function() {					            		           
+							handleErrorInDialog(XMLHttpResponse, $thisDialog);
+						});
+				    }
+				});		        
+	        },
+	        "Cancel": function() {
+	            $(this).dialog("close");
+	        }		    
+	    }).dialog("open");
+        
+        return false;
+    });             
+}
 
 function nfsURL(server, path) {
     var url;