Add editUrl, remoteUrl attributes of node element in project.dtd, upd…

…ate parser and tests. Add link to editUrl in node view in rundeckapp
rundeck · Oct 15, 2010 · 238cef3 · 238cef3
1 parent 8c5451d
commit 238cef3
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 1 deletion.
diff --git a/core/src/java/com/dtolabs/rundeck/core/common/NodesXMLParser.java b/core/src/java/com/dtolabs/rundeck/core/common/NodesXMLParser.java
@@ -111,6 +111,24 @@ private void fillNode(final ResourceXMLParser.Entity entity, final NodeEntryImpl
                 node.getSettings().put(setting.getName(), setting.getProperty(SETTING_VALUE));
             }
         }
+
+        if(null!=entity.getProperty(NODE_EDIT_URL)){
+            //use attributes for other node data
+
+            if (null == node.getAttributes()) {
+                node.setAttributes(new HashMap<String, String>());
+            }
+            node.getAttributes().put(NODE_EDIT_URL, entity.getProperty(NODE_EDIT_URL));
+        }
+        if(null != entity.getProperty(NODE_REMOTE_URL)){
+            //use attributes for other node data
+
+            if (null == node.getAttributes()) {
+                node.setAttributes(new HashMap<String, String>());
+            }
+            node.getAttributes().put(NODE_REMOTE_URL, entity.getProperty(NODE_REMOTE_URL));
+        }
+
     }
 
     public void resourcesParsed(final ResourceXMLParser.EntitySet entities) {

diff --git a/core/src/java/com/dtolabs/shared/resources/ResourceXMLConstants.java b/core/src/java/com/dtolabs/shared/resources/ResourceXMLConstants.java
@@ -81,6 +81,8 @@ public class ResourceXMLConstants {
     public static final String NODE_OS_NAME = "osName";
     public static final String NODE_OS_VERSION = "osVersion";
     public static final String NODE_USERNAME = "username";
+    public static final String NODE_EDIT_URL = "editUrl";
+    public static final String NODE_REMOTE_URL = "remoteUrl";
     /**
      * attributes of "node" nodes
      */
@@ -91,6 +93,8 @@ public class ResourceXMLConstants {
         NODE_OS_NAME,
         NODE_OS_VERSION,
         NODE_USERNAME,
+        NODE_EDIT_URL,
+        NODE_REMOTE_URL
     };
     public static final String SETTING_TYPE = "settingType";
     public static final String SETTING_VALUE = "settingValue";

diff --git a/core/src/java/com/dtolabs/shared/resources/project.dtd b/core/src/java/com/dtolabs/shared/resources/project.dtd
@@ -142,6 +142,8 @@
    hostname CDATA #IMPLIED
    username CDATA #IMPLIED
    tags CDATA #IMPLIED
+   editUrl CDATA #IMPLIED
+   remoteUrl CDATA #IMPLIED
 >
 
 <!ELEMENT resources (resource+)>

diff --git a/core/src/test/com/dtolabs/rundeck/core/common/TestNodesXMLParser.java b/core/src/test/com/dtolabs/rundeck/core/common/TestNodesXMLParser.java
@@ -23,6 +23,7 @@
 * $Id$
 */
 
+import com.dtolabs.shared.resources.ResourceXMLConstants;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -169,4 +170,28 @@ public void testParseSettings() throws Exception {
             assertEquals("set4val", node2.getSettings().get("set4"));
         }
     }
+    public void testParseEditRemoteUrl() throws Exception {
+
+        {
+            final nodeReceiver receiver = new nodeReceiver();
+            nodesXMLParser = new NodesXMLParser(xmlfile3, receiver);
+            nodesXMLParser.parse();
+            assertEquals("wrong number of nodes parsed", 3, receiver.map.size());
+
+            INodeEntry node0 = receiver.map.get("testnode1");
+            assertNotNull(node0.getAttributes());
+            assertEquals("TestEditUrl1", node0.getAttributes().get(ResourceXMLConstants.NODE_EDIT_URL));
+            assertNull(node0.getAttributes().get(ResourceXMLConstants.NODE_REMOTE_URL));
+
+            INodeEntry node1 = receiver.map.get("testnode2");
+            assertNotNull(node1.getAttributes());
+            assertEquals("TestRemoteUrl2", node1.getAttributes().get(ResourceXMLConstants.NODE_REMOTE_URL));
+            assertNull(node1.getAttributes().get(ResourceXMLConstants.NODE_EDIT_URL));
+
+            INodeEntry node2 = receiver.map.get("testnode3");
+            assertNotNull(node2.getAttributes());
+            assertEquals("TestEditUrl3", node2.getAttributes().get(ResourceXMLConstants.NODE_EDIT_URL));
+            assertEquals("TestRemoteUrl3", node2.getAttributes().get(ResourceXMLConstants.NODE_REMOTE_URL));
+        }
+    }
 }
diff --git a/core/src/test/com/dtolabs/rundeck/core/common/test-nodes3.xml b/core/src/test/com/dtolabs/rundeck/core/common/test-nodes3.xml
@@ -24,6 +24,7 @@
         osName="Mac OS X"
         osVersion="10.5.1"
         username="username1"
+        editUrl="TestEditUrl1"
       >
 
   </node>
@@ -33,6 +34,7 @@
         osFamily="windows"
         osName="Windows XP"
         osVersion="5.1"
+        remoteUrl="TestRemoteUrl2"
       >
     <resources>
         <resource name="set1" type="Setting"/>
@@ -45,6 +47,8 @@
         osFamily="solaris"
         osName="Solaris Something"
         osVersion="3.7"
+        editUrl="TestEditUrl3"
+        remoteUrl="TestRemoteUrl3"
       >
 
     <resources>

diff --git a/core/src/test/com/dtolabs/shared/resources/TestResourceXMLParser.java b/core/src/test/com/dtolabs/shared/resources/TestResourceXMLParser.java
@@ -281,7 +281,7 @@ public void resourcesParsed(ResourceXMLParser.EntitySet entities) {
             assertEquals("wrong node type", "node", entity.getResourceType());
             assertEquals("wrong name", "node1", entity.getName());
             assertEquals("wrong type", "Node1", entity.getType());
-            assertEquals("wrong properties size", 8, entity.getProperties().size());
+            assertEquals("wrong properties size", 10, entity.getProperties().size());
             assertEquals("wrong resources size", 0, entity.getResources().size());
             assertEquals("wrong referrers size", 0, entity.getReferrers().size());
             assertNull("wrong transforms ", entity.getTransforms());
@@ -293,6 +293,8 @@ public void resourcesParsed(ResourceXMLParser.EntitySet entities) {
             assertEquals("wrong value", "osFamily1", entity.getProperty(ResourceXMLConstants.NODE_OS_FAMILY));
             assertEquals("wrong value", "osName1", entity.getProperty(ResourceXMLConstants.NODE_OS_NAME));
             assertEquals("wrong value", "osVersion1", entity.getProperty(ResourceXMLConstants.NODE_OS_VERSION));
+            assertEquals("wrong value", "EditURL", entity.getProperty(ResourceXMLConstants.NODE_EDIT_URL));
+            assertEquals("wrong value", "RemoteURL", entity.getProperty(ResourceXMLConstants.NODE_REMOTE_URL));
         }
 
         { //test attributes of xpath="setting"

diff --git a/core/src/test/com/dtolabs/shared/resources/test-resources2.xml b/core/src/test/com/dtolabs/shared/resources/test-resources2.xml
@@ -24,6 +24,8 @@
         osArch="osArch1"
         osVersion="osVersion1"
         username="username1"
+        editUrl="EditURL"
+        remoteUrl="RemoteURL"
       >
 
   </node>

diff --git a/rundeckapp/grails-app/views/framework/_nodes.gsp b/rundeckapp/grails-app/views/framework/_nodes.gsp
@@ -48,6 +48,10 @@
                         ${node.description}
                     </span>
 
+                    <g:if test="${node.attributes?.editUrl}">
+                        <a href="${node.attributes?.editUrl}" target="_new">Edit...</a>
+                    </g:if>
+
                     <g:if test="${expanddetail}">
                         <g:link  controller="reports" action="index" params="${[nodeFilter:node.nodename]}" title="View Events for Node ${node.nodename}">
                             &raquo; events