mgmt+tools: rename 'datas' to 'data'
Plural form of 'data' is 'data'.
refs #3955
Change-Id: I62f5ebe53b8e36d565e5a243288eb12ae9a08014
diff --git a/daemon/mgmt/face-manager.cpp b/daemon/mgmt/face-manager.cpp
index d9b2a03..4cc3288 100644
--- a/daemon/mgmt/face-manager.cpp
+++ b/daemon/mgmt/face-manager.cpp
@@ -394,8 +394,8 @@
const face::FaceCounters& counters = face.getCounters();
status.setNInInterests(counters.nInInterests)
.setNOutInterests(counters.nOutInterests)
- .setNInDatas(counters.nInData)
- .setNOutDatas(counters.nOutData)
+ .setNInData(counters.nInData)
+ .setNOutData(counters.nOutData)
.setNInNacks(counters.nInNacks)
.setNOutNacks(counters.nOutNacks)
.setNInBytes(counters.nInBytes)
diff --git a/daemon/mgmt/forwarder-status-manager.cpp b/daemon/mgmt/forwarder-status-manager.cpp
index 025f3f6..108914f 100644
--- a/daemon/mgmt/forwarder-status-manager.cpp
+++ b/daemon/mgmt/forwarder-status-manager.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+ * Copyright (c) 2014-2017, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -58,8 +58,8 @@
const ForwarderCounters& counters = m_forwarder.getCounters();
status.setNInInterests(counters.nInInterests)
.setNOutInterests(counters.nOutInterests)
- .setNInDatas(counters.nInData)
- .setNOutDatas(counters.nOutData)
+ .setNInData(counters.nInData)
+ .setNOutData(counters.nOutData)
.setNInNacks(counters.nInNacks)
.setNOutNacks(counters.nOutNacks);
diff --git a/tests/tools/nfdc/face-module.t.cpp b/tests/tools/nfdc/face-module.t.cpp
index de68fe6..cf5e893 100644
--- a/tests/tools/nfdc/face-module.t.cpp
+++ b/tests/tools/nfdc/face-module.t.cpp
@@ -59,10 +59,10 @@
.setFacePersistency(ndn::nfd::FACE_PERSISTENCY_PERMANENT)
.setLinkType(ndn::nfd::LINK_TYPE_MULTI_ACCESS)
.setNInInterests(22562)
- .setNInDatas(22031)
+ .setNInData(22031)
.setNInNacks(63)
.setNOutInterests(30121)
- .setNOutDatas(20940)
+ .setNOutData(20940)
.setNOutNacks(1218)
.setNInBytes(2522915)
.setNOutBytes(1353592);
@@ -75,10 +75,10 @@
.setLinkType(ndn::nfd::LINK_TYPE_POINT_TO_POINT)
.setFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED, true)
.setNInInterests(18998)
- .setNInDatas(26701)
+ .setNInData(26701)
.setNInNacks(147)
.setNOutInterests(34779)
- .setNOutDatas(17028)
+ .setNOutData(17028)
.setNOutNacks(1176)
.setNInBytes(4672308)
.setNOutBytes(8957187);
@@ -116,10 +116,10 @@
.setFacePersistency(ndn::nfd::FACE_PERSISTENCY_PERSISTENT)
.setLinkType(ndn::nfd::LINK_TYPE_POINT_TO_POINT)
.setNInInterests(2325)
- .setNInDatas(1110)
+ .setNInData(1110)
.setNInNacks(79)
.setNOutInterests(2278)
- .setNOutDatas(485)
+ .setNOutData(485)
.setNOutNacks(841)
.setNInBytes(4716834)
.setNOutBytes(308108);
@@ -182,10 +182,10 @@
.setFacePersistency(ndn::nfd::FACE_PERSISTENCY_ON_DEMAND)
.setLinkType(ndn::nfd::LINK_TYPE_POINT_TO_POINT)
.setNInInterests(28975)
- .setNInDatas(28232)
+ .setNInData(28232)
.setNInNacks(212)
.setNOutInterests(19525)
- .setNOutDatas(30993)
+ .setNOutData(30993)
.setNOutNacks(1038)
.setNInBytes(13307258)
.setNOutBytes(6231946);
@@ -531,12 +531,12 @@
<packetCounters>
<incomingPackets>
<nInterests>22562</nInterests>
- <nDatas>22031</nDatas>
+ <nData>22031</nData>
<nNacks>63</nNacks>
</incomingPackets>
<outgoingPackets>
<nInterests>30121</nInterests>
- <nDatas>20940</nDatas>
+ <nData>20940</nData>
<nNacks>1218</nNacks>
</outgoingPackets>
</packetCounters>
@@ -558,12 +558,12 @@
<packetCounters>
<incomingPackets>
<nInterests>18998</nInterests>
- <nDatas>26701</nDatas>
+ <nData>26701</nData>
<nNacks>147</nNacks>
</incomingPackets>
<outgoingPackets>
<nInterests>34779</nInterests>
- <nDatas>17028</nDatas>
+ <nData>17028</nData>
<nNacks>1176</nNacks>
</outgoingPackets>
</packetCounters>
@@ -595,10 +595,10 @@
.setFacePersistency(ndn::nfd::FACE_PERSISTENCY_PERMANENT)
.setLinkType(ndn::nfd::LINK_TYPE_MULTI_ACCESS)
.setNInInterests(22562)
- .setNInDatas(22031)
+ .setNInData(22031)
.setNInNacks(63)
.setNOutInterests(30121)
- .setNOutDatas(20940)
+ .setNOutData(20940)
.setNOutNacks(1218)
.setNInBytes(2522915)
.setNOutBytes(1353592);
@@ -611,10 +611,10 @@
.setLinkType(ndn::nfd::LINK_TYPE_POINT_TO_POINT)
.setFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED, true)
.setNInInterests(18998)
- .setNInDatas(26701)
+ .setNInData(26701)
.setNInNacks(147)
.setNOutInterests(34779)
- .setNOutDatas(17028)
+ .setNOutData(17028)
.setNOutNacks(1176)
.setNInBytes(4672308)
.setNOutBytes(8957187);
diff --git a/tests/tools/nfdc/forwarder-general-module.t.cpp b/tests/tools/nfdc/forwarder-general-module.t.cpp
index ed026f2..688f9dd 100644
--- a/tests/tools/nfdc/forwarder-general-module.t.cpp
+++ b/tests/tools/nfdc/forwarder-general-module.t.cpp
@@ -59,7 +59,7 @@
}
private:
- virtual void
+ void
signDatasetReply(Data& data) override
{
m_keyChain.sign(data, ndn::security::signingByIdentity("/nfd-status/test-nfdid"));
@@ -81,12 +81,12 @@
<packetCounters>
<incomingPackets>
<nInterests>20699052</nInterests>
- <nDatas>5598070</nDatas>
+ <nData>5598070</nData>
<nNacks>7230</nNacks>
</incomingPackets>
<outgoingPackets>
<nInterests>36501092</nInterests>
- <nDatas>5671942</nDatas>
+ <nData>5671942</nData>
<nNacks>26762</nNacks>
</outgoingPackets>
</packetCounters>
@@ -107,8 +107,8 @@
nCsEntries=65536
nInInterests=20699052
nOutInterests=36501092
- nInDatas=5598070
- nOutDatas=5671942
+ nInData=5598070
+ nOutData=5671942
nInNacks=7230
nOutNacks=26762
)TEXT").substr(1);
@@ -126,10 +126,10 @@
.setNMeasurementsEntries(1)
.setNCsEntries(65536)
.setNInInterests(20699052)
- .setNInDatas(5598070)
+ .setNInData(5598070)
.setNInNacks(7230)
.setNOutInterests(36501092)
- .setNOutDatas(5671942)
+ .setNOutData(5671942)
.setNOutNacks(26762);
this->sendDataset("/localhost/nfd/status/general", payload);
this->prepareStatusOutput();
diff --git a/tools/nfd-status-http-server-files/nfd-status.xsl b/tools/nfd-status-http-server-files/nfd-status.xsl
index ff92dae..92a0488 100644
--- a/tools/nfd-status-http-server-files/nfd-status.xsl
+++ b/tools/nfd-status-http-server-files/nfd-status.xsl
@@ -105,8 +105,8 @@
<td><xsl:value-of select="nfd:nCsEntries"/></td>
<td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nInterests"/></td>
<td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nInterests"/></td>
- <td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nDatas"/></td>
- <td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nDatas"/></td>
+ <td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nData"/></td>
+ <td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nData"/></td>
<td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nNacks"/></td>
<td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nNacks"/></td>
</tr>
@@ -198,11 +198,11 @@
</xsl:choose>
</td>
<td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nInterests"/></td>
- <td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nDatas"/></td>
+ <td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nData"/></td>
<td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nNacks"/></td>
<td><xsl:value-of select="nfd:byteCounters/nfd:incomingBytes"/></td>
<td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nInterests"/></td>
- <td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nDatas"/></td>
+ <td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nData"/></td>
<td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nNacks"/></td>
<td><xsl:value-of select="nfd:byteCounters/nfd:outgoingBytes"/></td>
</tr>
diff --git a/tools/nfdc/face-module.cpp b/tools/nfdc/face-module.cpp
index 2ec3719..857956e 100644
--- a/tools/nfdc/face-module.cpp
+++ b/tools/nfdc/face-module.cpp
@@ -333,12 +333,12 @@
os << "<packetCounters>";
os << "<incomingPackets>"
<< "<nInterests>" << item.getNInInterests() << "</nInterests>"
- << "<nDatas>" << item.getNInDatas() << "</nDatas>"
+ << "<nData>" << item.getNInData() << "</nData>"
<< "<nNacks>" << item.getNInNacks() << "</nNacks>"
<< "</incomingPackets>";
os << "<outgoingPackets>"
<< "<nInterests>" << item.getNOutInterests() << "</nInterests>"
- << "<nDatas>" << item.getNOutDatas() << "</nDatas>"
+ << "<nData>" << item.getNOutData() << "</nData>"
<< "<nNacks>" << item.getNOutNacks() << "</nNacks>"
<< "</outgoingPackets>";
os << "</packetCounters>";
@@ -378,12 +378,12 @@
os << ia("counters")
<< "{in={"
<< item.getNInInterests() << "i "
- << item.getNInDatas() << "d "
+ << item.getNInData() << "d "
<< item.getNInNacks() << "n "
<< item.getNInBytes() << "B} "
<< "out={"
<< item.getNOutInterests() << "i "
- << item.getNOutDatas() << "d "
+ << item.getNOutData() << "d "
<< item.getNOutNacks() << "n "
<< item.getNOutBytes() << "B}}";
diff --git a/tools/nfdc/forwarder-general-module.cpp b/tools/nfdc/forwarder-general-module.cpp
index dc12e96..ee3e0af 100644
--- a/tools/nfdc/forwarder-general-module.cpp
+++ b/tools/nfdc/forwarder-general-module.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+ * Copyright (c) 2014-2017, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -93,12 +93,12 @@
os << "<packetCounters>";
os << "<incomingPackets>"
<< "<nInterests>" << item.getNInInterests() << "</nInterests>"
- << "<nDatas>" << item.getNInDatas() << "</nDatas>"
+ << "<nData>" << item.getNInData() << "</nData>"
<< "<nNacks>" << item.getNInNacks() << "</nNacks>"
<< "</incomingPackets>";
os << "<outgoingPackets>"
<< "<nInterests>" << item.getNOutInterests() << "</nInterests>"
- << "<nDatas>" << item.getNOutDatas() << "</nDatas>"
+ << "<nData>" << item.getNOutData() << "</nData>"
<< "<nNacks>" << item.getNOutNacks() << "</nNacks>"
<< "</outgoingPackets>";
os << "</packetCounters>";
@@ -131,8 +131,8 @@
os << " nInInterests=" << item.getNInInterests() << "\n";
os << " nOutInterests=" << item.getNOutInterests() << "\n";
- os << " nInDatas=" << item.getNInDatas() << "\n";
- os << " nOutDatas=" << item.getNOutDatas() << "\n";
+ os << " nInData=" << item.getNInData() << "\n";
+ os << " nOutData=" << item.getNOutData() << "\n";
os << " nInNacks=" << item.getNInNacks() << "\n";
os << " nOutNacks=" << item.getNOutNacks() << "\n";
}