As asked on the discuss list, here's the patch against 1.8.10-2 that
adds asset fields for
CPU
RAM
Storage Contoller
HDD 1
HDD 2
HDD 3
HDD 4
HDD 5
HDD 6
Number of power supplies
Inputpower
Additional Hardware
Admin
Snmpcommunity
Please see attached files. If you want these patches in any other format
or in another place (jira?), just let me know.
Comments and improvements welcome.
Regards
Dominik
--- ./opennms/opennms-base-assembly/src/main/filtered/etc/create.sql 2011-04-04 15:37:29.249589129 +0200
+++ ./opennms.patched/opennms-base-assembly/src/main/filtered/etc/create.sql 2011-04-04 15:38:40.492643511 +0200
@@ -1153,6 +1153,20 @@
comment text,
managedObjectInstance varchar(512),
managedObjectType varchar(512),
+ cpu varchar(32),
+ ram varchar(10),
+ storagectrl varchar(32),
+ hdd1 varchar(32),
+ hdd2 varchar(32),
+ hdd3 varchar(32),
+ hdd4 varchar(32),
+ hdd5 varchar(32),
+ hdd6 varchar(32),
+ numpowersupplies varchar(1),
+ inputpower varchar(6),
+ additionalhardware varchar(64),
+ admin varchar(32),
+ snmpcommunity varchar(32)
constraint pk_assetID primary key (id),
constraint fk_nodeID5 foreign key (nodeID) references node ON DELETE CASCADE
--- opennms/opennms-webapp/src/main/java/org/opennms/web/asset/AssetModel.java 2011-03-10 13:37:16.000000000 +0100
+++ opennms.patched/opennms-webapp/src/main/java/org/opennms/web/asset/AssetModel.java 2011-04-04 13:27:14.000000000 +0200
@@ -141,7 +141,7 @@
Connection conn = Vault.getDbConnection();
d.watch(conn);
- PreparedStatement stmt = conn.prepareStatement("INSERT INTO ASSETS (nodeID,category,manufacturer,vendor,modelNumber,serialNumber,description,circuitId,assetNumber,operatingSystem,rack,slot,port,region,division,department,address1,address2,city,state,zip,building,floor,room,vendorPhone,vendorFax,userLastModified,lastModifiedDate,dateInstalled,lease,leaseExpires,supportPhone,maintContract,vendorAssetNumber,maintContractExpires,displayCategory,notifyCategory,pollerCategory,thresholdCategory,comment,username,password,enable,connection,autoenable) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+ PreparedStatement stmt = conn.prepareStatement("INSERT INTO ASSETS (nodeID,category,manufacturer,vendor,modelNumber,serialNumber,description,circuitId,assetNumber,operatingSystem,rack,slot,port,region,division,department,address1,address2,city,state,zip,building,floor,room,vendorPhone,vendorFax,userLastModified,lastModifiedDate,dateInstalled,lease,leaseExpires,supportPhone,maintContract,vendorAssetNumber,maintContractExpires,displayCategory,notifyCategory,pollerCategory,thresholdCategory,comment,username,password,enable,connection,autoenable,cpu,ram,storagectrl,hdd1,hdd2,hdd3,hdd4,hdd5,hdd6,numpowersupplies,inputpower,additionalhardware,admin,snmpcommunity) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
d.watch(stmt);
stmt.setInt(1, asset.nodeId);
stmt.setString(2, asset.category);
@@ -188,6 +188,20 @@
stmt.setString(43, asset.enable);
stmt.setString(44, asset.connection);
stmt.setString(45, asset.autoenable);
+ stmt.setString(46, asset.cpu);
+ stmt.setString(47, asset.ram);
+ stmt.setString(48, asset.storagectrl);
+ stmt.setString(49, asset.hdd1);
+ stmt.setString(50, asset.hdd2);
+ stmt.setString(51, asset.hdd3);
+ stmt.setString(52, asset.hdd4);
+ stmt.setString(53, asset.hdd5);
+ stmt.setString(54, asset.hdd6);
+ stmt.setString(55, asset.numpowersupplies);
+ stmt.setString(56, asset.inputpower);
+ stmt.setString(57, asset.additionalhardware);
+ stmt.setString(58, asset.admin);
+ stmt.setString(59, asset.snmpcommunity);
stmt.execute();
} finally {
@@ -209,7 +223,7 @@
Connection conn = Vault.getDbConnection();
d.watch(conn);
- PreparedStatement stmt = conn.prepareStatement("UPDATE ASSETS SET category=?,manufacturer=?,vendor=?,modelNumber=?,serialNumber=?,description=?,circuitId=?,assetNumber=?,operatingSystem=?,rack=?,slot=?,port=?,region=?,division=?,department=?,address1=?,address2=?,city=?,state=?,zip=?,building=?,floor=?,room=?,vendorPhone=?,vendorFax=?,userLastModified=?,lastModifiedDate=?,dateInstalled=?,lease=?,leaseExpires=?,supportPhone=?,maintContract=?,vendorAssetNumber=?,maintContractExpires=?,displayCategory=?,notifyCategory=?,pollerCategory=?,thresholdCategory=?,comment=?, username=?, password=?,enable=?,connection=?,autoenable=? WHERE nodeid=?");
+ PreparedStatement stmt = conn.prepareStatement("UPDATE ASSETS SET category=?,manufacturer=?,vendor=?,modelNumber=?,serialNumber=?,description=?,circuitId=?,assetNumber=?,operatingSystem=?,rack=?,slot=?,port=?,region=?,division=?,department=?,address1=?,address2=?,city=?,state=?,zip=?,building=?,floor=?,room=?,vendorPhone=?,vendorFax=?,userLastModified=?,lastModifiedDate=?,dateInstalled=?,lease=?,leaseExpires=?,supportPhone=?,maintContract=?,vendorAssetNumber=?,maintContractExpires=?,displayCategory=?,notifyCategory=?,pollerCategory=?,thresholdCategory=?,comment=?, username=?, password=?,enable=?,connection=?,autoenable=?,cpu=?,ram=?,storagectrl=?,hdd1=?,hdd2=?,hdd3=?,hdd4=?,hdd5=?,hdd6=?,numpowersupplies=?,inputpower=?,additionalhardware=?,admin=?,snmpcommunity=? WHERE nodeid=?");
d.watch(stmt);
stmt.setString(1, asset.category);
stmt.setString(2, asset.manufacturer);
@@ -255,7 +269,21 @@
stmt.setString(42, asset.enable);
stmt.setString(43, asset.connection);
stmt.setString(44, asset.autoenable);
- stmt.setInt(45, asset.nodeId);
+ stmt.setString(45, asset.cpu);
+ stmt.setString(46, asset.ram);
+ stmt.setString(47, asset.storagectrl);
+ stmt.setString(48, asset.hdd1);
+ stmt.setString(49, asset.hdd2);
+ stmt.setString(50, asset.hdd3);
+ stmt.setString(51, asset.hdd4);
+ stmt.setString(52, asset.hdd5);
+ stmt.setString(53, asset.hdd6);
+ stmt.setString(54, asset.numpowersupplies);
+ stmt.setString(55, asset.inputpower);
+ stmt.setString(56, asset.additionalhardware);
+ stmt.setString(57, asset.admin);
+ stmt.setString(58, asset.snmpcommunity);
+ stmt.setInt(59, asset.nodeId);
stmt.execute();
} finally {
@@ -382,6 +410,20 @@
asset.setEnable(rs.getString("enable"));
asset.setConnection(rs.getString("connection"));
asset.setAutoenable(rs.getString("autoenable"));
+ asset.setCpu(rs.getString("cpu"));
+ asset.setRam(rs.getString("ram"));
+ asset.setStoragectrl(rs.getString("storagectrl"));
+ asset.setHdd1(rs.getString("hdd1"));
+ asset.setHdd2(rs.getString("hdd2"));
+ asset.setHdd3(rs.getString("hdd3"));
+ asset.setHdd4(rs.getString("hdd4"));
+ asset.setHdd5(rs.getString("hdd5"));
+ asset.setHdd6(rs.getString("hdd6"));
+ asset.setNumpowersupplies(rs.getString("numpowersupplies"));
+ asset.setInputpower(rs.getString("inputpower"));
+ asset.setAdditionalhardware(rs.getString("additionalhardware"));
+ asset.setAdmin(rs.getString("admin"));
+ asset.setSnmpcommunity(rs.getString("snmpcommunity"));
// Convert from java.sql.Timestamp to java.util.Date, since it looks more pretty or something
asset.lastModifiedDate = new Date(rs.getTimestamp("lastModifiedDate").getTime());
@@ -461,6 +503,20 @@
new String[] { "Password", "password" },
new String[] { "Enable Password", "enable" },
new String[] { "Connection type", "connection" },
- new String[] { "Auto Enable", "autoenable" }
+ new String[] { "Auto Enable", "autoenable" },
+ new String[] { "Cpu", "cpu" },
+ new String[] { "Ram", "ram" },
+ new String[] { "Storage Controller", "storagectrl" },
+ new String[] { "HDD 1", "hdd1" },
+ new String[] { "HDD 2", "hdd2" },
+ new String[] { "HDD 3", "hdd3" },
+ new String[] { "HDD 4", "hdd4" },
+ new String[] { "HDD 5", "hdd5" },
+ new String[] { "HDD 6", "hdd6" },
+ new String[] { "Number of power supplies", "numpowersupplies" },
+ new String[] { "Inputpower", "inputpower" },
+ new String[] { "Additional hardware", "additionalhardware" },
+ new String[] { "Admin", "admin" },
+ new String[] { "SNMP community", "snmpcommunity" }
};
}
--- opennms/opennms-webapp/src/main/java/org/opennms/web/asset/ExportAssetsServlet.java 2011-03-10 13:37:16.000000000 +0100
+++ opennms.patched/opennms-webapp/src/main/java/org/opennms/web/asset/ExportAssetsServlet.java 2011-04-04 12:52:15.000000000 +0200
@@ -138,7 +138,21 @@
"Enable",
"Connection",
"Auto Enable",
- "Comments"
+ "Comments",
+ "Cpu",
+ "Ram",
+ "Storage Controller",
+ "HDD 1",
+ "HDD 2",
+ "HDD 3",
+ "HDD 4",
+ "HDD 5",
+ "HDD 6",
+ "Number of power supplies",
+ "Inputpower",
+ "Additional hardware",
+ "Admin",
+ "SNMP Community"
};
out.writeNext(header);
@@ -192,6 +206,20 @@
entries.add(asset.getConnection());
entries.add(asset.getAutoenable());
entries.add(asset.getComments());
+ entries.add(asset.getCpu());
+ entries.add(asset.getRam());
+ entries.add(asset.getStoragectrl());
+ entries.add(asset.getHdd1());
+ entries.add(asset.getHdd2());
+ entries.add(asset.getHdd3());
+ entries.add(asset.getHdd4());
+ entries.add(asset.getHdd5());
+ entries.add(asset.getHdd6());
+ entries.add(asset.getNumpowersupplies());
+ entries.add(asset.getInputpower());
+ entries.add(asset.getAdditionalhardware());
+ entries.add(asset.getAdmin());
+ entries.add(asset.getSnmpcommunity());
out.writeNext(entries.toArray(new String[0]));
}
--- opennms/opennms-webapp/src/main/java/org/opennms/web/asset/ModifyAssetServlet.java 2011-04-04 15:37:29.425588262 +0200
+++ opennms.patched/opennms-webapp/src/main/java/org/opennms/web/asset/ModifyAssetServlet.java 2011-04-04 12:55:27.000000000 +0200
@@ -190,6 +190,20 @@
asset.setEnable(getRequestParameter(request, "enable"));
asset.setConnection(getRequestParameter(request, "connection"));
asset.setAutoenable(getRequestParameter(request, "autoenable"));
+ asset.setCpu(getRequestParameter(request, "cpu"));
+ asset.setRam(getRequestParameter(request, "ram"));
+ asset.setStoragectrl(getRequestParameter(request, "storagectrl"));
+ asset.setHdd1(getRequestParameter(request, "hdd1"));
+ asset.setHdd2(getRequestParameter(request, "hdd2"));
+ asset.setHdd3(getRequestParameter(request, "hdd3"));
+ asset.setHdd4(getRequestParameter(request, "hdd4"));
+ asset.setHdd5(getRequestParameter(request, "hdd5"));
+ asset.setHdd6(getRequestParameter(request, "hdd6"));
+ asset.setNumpowersupplies(getRequestParameter(request, "numpowersupplies"));
+ asset.setInputpower(getRequestParameter(request, "inputpower"));
+ asset.setAdditionalhardware(getRequestParameter(request, "additionalhardware"));
+ asset.setAdmin(getRequestParameter(request, "admin"));
+ asset.setSnmpcommunity(getRequestParameter(request, "snmpcommunity"));
asset.setUserLastModified(request.getRemoteUser());
asset.setLastModifiedDate(new Date());
--- opennms/opennms-webapp/src/main/webapp/asset/modify.jsp 2011-04-04 15:57:09.420603698 +0200
+++ opennms.patched/opennms-webapp/src/main/webapp/asset/modify.jsp 2011-04-04 14:24:15.960589151 +0200
@@ -195,7 +195,7 @@
<td>Address 1</td>
<td colspan="3"><%=getTextField(request, "text", "address1", asset.getAddress1(), "100", "256")%></td>
<td>Admin</td>
- <td><%=getTextField(request, "text", "admin", asset.getAdmin(), "20", "64")%></td>
+ <td><input type="text" name="admin" value="<%=asset.getAdmin()%>" size="20" maxlength="32"/></td>
</tr>
<tr>
<td>Address 2</td>
@@ -298,49 +298,46 @@
</select>
<% }else{ getTextField(request, "text", "autoEnable", asset.getAutoenable(), "20", "64"); } %>
</td>
- <% if(isAuthorizedUser){ %>
<td>SNMP community</td>
- <td><%=getTextField( request, "text", "snmpcommunity", asset.getSnmpcommunity(), "20", "32")%></td>
- <% } else { %>
- <td> </td>
- <td> </td>
- <% } %>
+ <td><input type="text" name="snmpcommunity" value="<%=asset.getSnmpcommunity()%>" size="20" maxlength="32"/></td>
</tr>
+ <!-- dk -->
<tr>
<td colspan="6"><h3>Hardware</h3></td>
</tr>
<tr>
<td>Cpu</td>
- <td><%=getTextField( request, "text", "cpu", asset.getCpu(), "20", "32")%></td>
+ <td><input type="text" name="cpu" value="<%=asset.getCpu()%>" size="20" maxlength="32"/></td>
<td>Ram</td>
- <td><%=getTextField( request, "text", "ram", asset.getRam(), "10", "10")%></td>
+ <td><input type="text" name="ram" value="<%=asset.getRam()%>" size="20" maxlength="32"/></td>
<td>Storage Controller</td>
- <td><%=getTextField( request, "text", "storagectrl", asset.getStoragectrl(), "20", "32")%></td>
+ <td><input type="text" name="storagectrl" value="<%=asset.getStoragectrl()%>" size="20" maxlength="32"/></td>
</tr>
<tr>
<td>HDD 1</td>
- <td><%=getTextField( request, "text", "hdd1", asset.getHdd1(), "20", "32")%></td>
+ <td><input type="text" name="hdd1" value="<%=asset.getHdd1()%>" size="20" maxlength="32"/></td>
<td>HDD 4</td>
- <td><%=getTextField( request, "text", "hdd4", asset.getHdd4(), "20", "32")%></td>
+ <td><input type="text" name="hdd4" value="<%=asset.getHdd4()%>" size="20" maxlength="32"/></td>
<td>Additional hardware</td>
- <td><%=getTextField( request, "text", "additionalhardware", asset.getAdditionalhardware(), "20", "64")%></td>
+ <td><input type="text" name="additionalhardware" value="<%=asset.getAdditionalhardware()%>" size="20" maxlength="64"/></td>
</tr>
<tr>
<td>HDD 2</td>
- <td><%=getTextField( request, "text", "hdd2", asset.getHdd2(), "20", "32")%></td>
+ <td><input type="text" name="hdd2" value="<%=asset.getHdd2()%>" size="20" maxlength="32"/></td>
<td>HDD 5</td>
- <td><%=getTextField( request, "text", "hdd5", asset.getHdd5(), "20", "32")%></td>
+ <td><input type="text" name="hdd5" value="<%=asset.getHdd5()%>" size="20" maxlength="32"/></td>
<td>Number of power supplies</td>
- <td><%=getTextField( request, "text", "numpowersupplies", asset.getNumpowersupplies(), "1", "1")%></td>
+ <td><input type="text" name="numpowersupplies" value="<%=asset.getNumpowersupplies()%>" size="20" maxlength="32"/></td>
</tr>
<tr>
<td>HDD 3</td>
- <td><%=getTextField( request, "text", "hdd3", asset.getHdd3(), "20", "32")%></td>
+ <td><input type="text" name="hdd4" value="<%=asset.getHdd4()%>" size="20" maxlength="32"/></td>
<td>HDD 6</td>
- <td><%=getTextField( request, "text", "hdd6", asset.getHdd6(), "20", "32")%></td>
+ <td><input type="text" name="hdd6" value="<%=asset.getHdd6()%>" size="20" maxlength="32"/></td>
<td>Inputpower</td>
- <td><%=getTextField( request, "text", "inputpower", asset.getInputpower(), "6", "6")%></td>
+ <td><input type="text" name="inputpower" value="<%=asset.getInputpower()%>" size="20" maxlength="6"/></td>
</tr>
+<!-- dk -->
<tr>
<td colspan="6"><h3>Comments</h3></td>
</tr>
--- opennms/opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAssetRecord.java 2011-04-04 15:37:29.305588219 +0200
+++ opennms.patched/opennms-model/src/main/java/org/opennms/netmgt/model/OnmsAssetRecord.java 2011-04-04 13:05:04.000000000 +0200
@@ -217,6 +217,48 @@
/** identifier field */
private String m_comment;
+ /** identifier field */
+ private String m_cpu;
+
+ /** identifier field */
+ private String m_ram;
+
+ /** identifier field */
+ private String m_storagectrl;
+
+ /** identifier field */
+ private String m_hdd1;
+
+ /** identifier field */
+ private String m_hdd2;
+
+ /** identifier field */
+ private String m_hdd3;
+
+ /** identifier field */
+ private String m_hdd4;
+
+ /** identifier field */
+ private String m_hdd5;
+
+ /** identifier field */
+ private String m_hdd6;
+
+ /** identifier field */
+ private String m_numpowersupplies;
+
+ /** identifier field */
+ private String m_inputpower;
+
+ /** identifier field */
+ private String m_additionalhardware;
+
+ /** identifier field */
+ private String m_admin;
+
+ /** identifier field */
+ private String m_snmpcommunity;
+
/** persistent field */
private OnmsNode m_node;
@@ -1159,12 +1201,275 @@
* @param autoenable a {@link java.lang.String} object.
*/
public void setAutoenable(String autoenable) {
- if (autoenable != null && autoenable.equals(AUTOENABLED))
- m_autoenable = autoenable;
- else
m_autoenable = autoenable;
}
+ /**
+ * <p>getCpu</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ @Column(name="cpu", length=1)
+ public String getCpu() {
+ return m_cpu;
+ }
+
+ /**
+ * <p>setCpu</p>
+ *
+ * @param cpu a {@link java.lang.String} object.
+ */
+ public void setCpu(String cpu) {
+ m_cpu = cpu;
+ }
+
+ /**
+ * <p>getRam</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ @Column(name="ram", length=1)
+ public String getRam() {
+ return m_ram;
+ }
+
+ /**
+ * <p>setRam</p>
+ *
+ * @param ram a {@link java.lang.String} object.
+ */
+ public void setRam(String ram) {
+ m_ram = ram;
+ }
+
+ /**
+ * <p>getSnmpcommunity</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ @Column(name="snmpcommunity", length=1)
+ public String getSnmpcommunity() {
+ return m_snmpcommunity;
+ }
+
+ /**
+ * <p>setSnmpcommunity</p>
+ *
+ * @param snmpcommunity a {@link java.lang.String} object.
+ */
+ public void setSnmpcommunity(String snmpcommunity) {
+ m_snmpcommunity = snmpcommunity;
+ }
+
+ /**
+ * <p>getAdmin</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ @Column(name="admin", length=1)
+ public String getAdmin() {
+ return m_admin;
+ }
+
+ /**
+ * <p>setAdmin</p>
+ *
+ * @param admin a {@link java.lang.String} object.
+ */
+ public void setAdmin(String admin) {
+ m_admin = admin;
+ }
+
+ /**
+ * <p>getAdditionalhardware</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ @Column(name="additionalhardware", length=1)
+ public String getAdditionalhardware() {
+ return m_additionalhardware;
+ }
+
+ /**
+ * <p>setAdditionalhardware</p>
+ *
+ * @param additionalhardware a {@link java.lang.String} object.
+ */
+ public void setAdditionalhardware(String additionalhardware) {
+ m_additionalhardware = additionalhardware;
+ }
+
+ /**
+ * <p>getInputpower</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ @Column(name="inputpower", length=1)
+ public String getInputpower() {
+ return m_inputpower;
+ }
+
+ /**
+ * <p>setInputpower</p>
+ *
+ * @param inputpower a {@link java.lang.String} object.
+ */
+ public void setInputpower(String inputpower) {
+ m_inputpower = inputpower;
+ }
+
+ /**
+ * <p>getNumpowersupplies</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ @Column(name="numpowersupplies", length=1)
+ public String getNumpowersupplies() {
+ return m_numpowersupplies;
+ }
+
+ /**
+ * <p>setNumpowersupplies</p>
+ *
+ * @param numpowersupplies a {@link java.lang.String} object.
+ */
+ public void setNumpowersupplies(String numpowersupplies) {
+ m_numpowersupplies = numpowersupplies;
+ }
+
+ /**
+ * <p>getHdd6</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ @Column(name="hdd6", length=1)
+ public String getHdd6() {
+ return m_hdd6;
+ }
+
+ /**
+ * <p>setHdd6</p>
+ *
+ * @param hdd6 a {@link java.lang.String} object.
+ */
+ public void setHdd6(String hdd6) {
+ m_hdd6 = hdd6;
+ }
+
+ /**
+ * <p>getHdd5</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ @Column(name="hdd5", length=1)
+ public String getHdd5() {
+ return m_hdd5;
+ }
+
+ /**
+ * <p>setHdd5</p>
+ *
+ * @param hdd5 a {@link java.lang.String} object.
+ */
+ public void setHdd5(String hdd5) {
+ m_hdd5 = hdd5;
+ }
+
+ /**
+ * <p>getHdd4</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ @Column(name="hdd4", length=1)
+ public String getHdd4() {
+ return m_hdd4;
+ }
+
+ /**
+ * <p>setHdd4</p>
+ *
+ * @param hdd4 a {@link java.lang.String} object.
+ */
+ public void setHdd4(String hdd4) {
+ m_hdd4 = hdd4;
+ }
+
+ /**
+ * <p>getHdd3</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ @Column(name="hdd3", length=1)
+ public String getHdd3() {
+ return m_hdd3;
+ }
+
+ /**
+ * <p>setHdd3</p>
+ *
+ * @param hdd3 a {@link java.lang.String} object.
+ */
+ public void setHdd3(String hdd3) {
+ m_hdd3 = hdd3;
+ }
+
+ /**
+ * <p>getHdd2</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ @Column(name="hdd2", length=1)
+ public String getHdd2() {
+ return m_hdd2;
+ }
+
+ /**
+ * <p>setHdd2</p>
+ *
+ * @param hdd2 a {@link java.lang.String} object.
+ */
+ public void setHdd2(String hdd2) {
+ m_hdd2 = hdd2;
+ }
+
+ /**
+ * <p>getHdd1</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ @Column(name="hdd1", length=1)
+ public String getHdd1() {
+ return m_hdd1;
+ }
+
+ /**
+ * <p>setHdd1</p>
+ *
+ * @param hdd1 a {@link java.lang.String} object.
+ */
+ public void setHdd1(String hdd1) {
+ m_hdd1 = hdd1;
+ }
+
+ /**
+ * <p>getStoragectrl</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ @Column(name="storagectrl", length=1)
+ public String getStoragectrl() {
+ return m_storagectrl;
+ }
+
+ /**
+ * <p>setStoragectrl</p>
+ *
+ * @param storagectrl a {@link java.lang.String} object.
+ */
+ public void setStoragectrl(String storagectrl) {
+ m_storagectrl = storagectrl;
+ }
+
/** {@inheritDoc} */
@Override
public String toString() {
@@ -1213,6 +1518,20 @@
.append("pollercategory", getPollerCategory())
.append("thresholdcategory", getThresholdCategory())
.append("comment", getComment())
+ .append("cpu", getCpu())
+ .append("ram", getRam())
+ .append("storagectrl", getStoragectrl())
+ .append("hdd1", getHdd1())
+ .append("hdd2", getHdd2())
+ .append("hdd3", getHdd3())
+ .append("hdd4", getHdd4())
+ .append("hdd5", getHdd5())
+ .append("hdd6", getHdd6())
+ .append("numpowersupplies", getNumpowersupplies())
+ .append("inputpower", getInputpower())
+ .append("additionalhardware", getAdditionalhardware())
+ .append("admin", getAdmin())
+ .append("snmpcommunity", getSnmpcommunity())
.toString();
}
--- opennms/opennms-webapp/src/main/java/org/opennms/web/asset/Asset.java 2011-03-10 13:37:16.000000000 +0100
+++ opennms.patched/opennms-webapp/src/main/java/org/opennms/web/asset/Asset.java 2011-04-04 12:37:55.000000000 +0200
@@ -179,6 +179,288 @@
protected String autoenable ="";
+ protected String cpu ="";
+
+ protected String ram ="";
+
+ protected String storagectrl ="";
+
+ protected String hdd1 ="";
+
+ protected String hdd2 ="";
+
+ protected String hdd3 ="";
+
+ protected String hdd4 ="";
+
+ protected String hdd5 ="";
+
+ protected String hdd6 ="";
+
+ protected String numpowersupplies ="";
+
+ protected String inputpower ="";
+
+ protected String additionalhardware ="";
+
+ protected String admin ="";
+
+ protected String snmpcommunity ="";
+
+ /**
+ * <p>Getter for the field <code>snmpcommunity</code>.</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ public String getSnmpcommunity() {
+ return snmpcommunity;
+ }
+
+ /**
+ * <p>Setter for the field <code>snmpcommunity</code>.</p>
+ *
+ * @param snmpcommunity a {@link java.lang.String} object.
+ */
+ public void setSnmpcommunity(String snmpcommunity) {
+ if (snmpcommunity != null) {
+ this.snmpcommunity = snmpcommunity;
+ } else {
+ this.snmpcommunity = "";
+ }
+ }
+ /**
+ * <p>Getter for the field <code>admin</code>.</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ public String getAdmin() {
+ return admin;
+ }
+
+ /**
+ * <p>Setter for the field <code>admin</code>.</p>
+ *
+ * @param admin a {@link java.lang.String} object.
+ */
+ public void setAdmin(String admin) {
+ if (admin != null) {
+ this.admin = admin;
+ } else {
+ this.admin = "";
+ }
+ }
+ /**
+ * <p>Getter for the field <code>additionalhardware</code>.</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ public String getAdditionalhardware() {
+ return additionalhardware;
+ }
+
+ /**
+ * <p>Setter for the field <code>additionalhardware</code>.</p>
+ *
+ * @param additionalhardware a {@link java.lang.String} object.
+ */
+ public void setAdditionalhardware(String additionalhardware) {
+ if (additionalhardware != null) {
+ this.additionalhardware = additionalhardware;
+ } else {
+ this.additionalhardware = "";
+ }
+ }
+ /**
+ * <p>Getter for the field <code>inputpower</code>.</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ public String getInputpower() {
+ return inputpower;
+ }
+
+ /**
+ * <p>Setter for the field <code>inputpower</code>.</p>
+ *
+ * @param inputpower a {@link java.lang.String} object.
+ */
+ public void setInputpower(String inputpower) {
+ if (inputpower != null) {
+ this.inputpower = inputpower;
+ } else {
+ this.inputpower = "";
+ }
+ }
+ /**
+ * <p>Getter for the field <code>numpowersupplies</code>.</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ public String getNumpowersupplies() {
+ return numpowersupplies;
+ }
+
+ /**
+ * <p>Setter for the field <code>numpowersupplies</code>.</p>
+ *
+ * @param numpowersupplies a {@link java.lang.String} object.
+ */
+ public void setNumpowersupplies(String numpowersupplies) {
+ if (numpowersupplies != null) {
+ this.numpowersupplies = numpowersupplies;
+ } else {
+ this.numpowersupplies = "";
+ }
+ }
+ /**
+ * <p>Getter for the field <code>hdd6</code>.</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ public String getHdd6() {
+ return hdd6;
+ }
+
+ /**
+ * <p>Setter for the field <code>hdd6</code>.</p>
+ *
+ * @param hdd6 a {@link java.lang.String} object.
+ */
+ public void setHdd6(String hdd6) {
+ if (hdd6 != null) {
+ this.hdd6 = hdd6;
+ } else {
+ this.hdd6 = "";
+ }
+ }
+ /**
+ * <p>Getter for the field <code>hdd5</code>.</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ public String getHdd5() {
+ return hdd5;
+ }
+
+ /**
+ * <p>Setter for the field <code>hdd5</code>.</p>
+ *
+ * @param hdd5 a {@link java.lang.String} object.
+ */
+ public void setHdd5(String hdd5) {
+ if (hdd5 != null) {
+ this.hdd5 = hdd5;
+ } else {
+ this.hdd5 = "";
+ }
+ }
+ /**
+ * <p>Getter for the field <code>hdd4</code>.</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ public String getHdd4() {
+ return hdd4;
+ }
+
+ /**
+ * <p>Setter for the field <code>hdd4</code>.</p>
+ *
+ * @param hdd4 a {@link java.lang.String} object.
+ */
+ public void setHdd4(String hdd4) {
+ if (hdd4 != null) {
+ this.hdd4 = hdd4;
+ } else {
+ this.hdd4 = "";
+ }
+ }
+ /**
+ * <p>Getter for the field <code>hdd3</code>.</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ public String getHdd3() {
+ return hdd3;
+ }
+
+ /**
+ * <p>Setter for the field <code>hdd3</code>.</p>
+ *
+ * @param hdd3 a {@link java.lang.String} object.
+ */
+ public void setHdd3(String hdd3) {
+ if (hdd3 != null) {
+ this.hdd3 = hdd3;
+ } else {
+ this.hdd3 = "";
+ }
+ }
+ /**
+ * <p>Getter for the field <code>hdd2</code>.</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ public String getHdd2() {
+ return hdd2;
+ }
+
+ /**
+ * <p>Setter for the field <code>hdd2</code>.</p>
+ *
+ * @param hdd2 a {@link java.lang.String} object.
+ */
+ public void setHdd2(String hdd2) {
+ if (hdd2 != null) {
+ this.hdd2 = hdd2;
+ } else {
+ this.hdd2 = "";
+ }
+ }
+ /**
+ * <p>Getter for the field <code>hdd1</code>.</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ public String getHdd1() {
+ return hdd1;
+ }
+
+ /**
+ * <p>Setter for the field <code>hdd1</code>.</p>
+ *
+ * @param hdd1 a {@link java.lang.String} object.
+ */
+ public void setHdd1(String hdd1) {
+ if (hdd1 != null) {
+ this.hdd1 = hdd1;
+ } else {
+ this.hdd1 = "";
+ }
+ }
+
+ /**
+ * <p>Getter for the field <code>storagectrl</code>.</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ public String getStoragectrl() {
+ return storagectrl;
+ }
+
+ /**
+ * <p>Setter for the field <code>storagectrl</code>.</p>
+ *
+ * @param storagectrl a {@link java.lang.String} object.
+ */
+ public void setStoragectrl(String storagectrl) {
+ if (storagectrl != null) {
+ this.storagectrl = storagectrl;
+ } else {
+ this.storagectrl = "";
+ }
+ }
+
/**
* <p>Setter for the field <code>nodeId</code>.</p>
*
@@ -1161,4 +1443,48 @@
}
}
+ /**
+ * <p>Getter for the field <code>cpu</code>.</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ public String getCpu() {
+ return cpu;
+ }
+
+ /**
+ * <p>Setter for the field <code>cpu</code>.</p>
+ *
+ * @param cpu a {@link java.lang.String} object.
+ */
+ public void setCpu(String cpu) {
+ if (cpu != null) {
+ this.cpu = cpu;
+ } else {
+ this.cpu = "";
+ }
+ }
+
+ /**
+ * <p>Getter for the field <code>ram</code>.</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ public String getRam() {
+ return ram;
+ }
+
+ /**
+ * <p>Setter for the field <code>ram</code>.</p>
+ *
+ * @param ram a {@link java.lang.String} object.
+ */
+ public void setRam(String ram) {
+ if (ram != null) {
+ this.ram = ram;
+ } else {
+ this.ram = "";
+ }
+ }
+
}
------------------------------------------------------------------------------
Create and publish websites with WebMatrix
Use the most popular FREE web apps or write code yourself;
WebMatrix provides all the features you need to develop and
publish your website. http://p.sf.net/sfu/ms-webmatrix-sf
_______________________________________________
Please read the OpenNMS Mailing List FAQ:
http://www.opennms.org/index.php/Mailing_List_FAQ
opennms-devel mailing list
To *unsubscribe* or change your subscription options, see the bottom of this
page:
https://lists.sourceforge.net/lists/listinfo/opennms-devel
