merge ca config and client config, remove old format of probe
Change-Id: I73500f532f166851d82c1bf1cc008c7ffc241ef3
diff --git a/tests/unit-tests/ca-module.t.cpp b/tests/unit-tests/ca-module.t.cpp
index 365cb90..599b6ce 100644
--- a/tests/unit-tests/ca-module.t.cpp
+++ b/tests/unit-tests/ca-module.t.cpp
@@ -35,8 +35,8 @@
BOOST_AUTO_TEST_CASE(Initialization)
{
util::DummyClientFace face(io, m_keyChain, {true, true});
- CaModule ca(face, m_keyChain, "tests/unit-tests/ca.conf.test", "ca-storage-memory");
- BOOST_CHECK_EQUAL(ca.getCaConf().m_caPrefix, "/ndn");
+ CaModule ca(face, m_keyChain, "tests/unit-tests/config-files/config-ca-1", "ca-storage-memory");
+ BOOST_CHECK_EQUAL(ca.getCaConf().m_caItem.m_caPrefix, "/ndn");
auto identity = addIdentity(Name("/ndn/site2"));
auto key = identity.getDefaultKey();
@@ -56,7 +56,7 @@
auto cert = key.getDefaultCertificate();
util::DummyClientFace face(io, m_keyChain, {true, true});
- CaModule ca(face, m_keyChain, "tests/unit-tests/ca.conf.test", "ca-storage-memory");
+ CaModule ca(face, m_keyChain, "tests/unit-tests/config-files/config-ca-1", "ca-storage-memory");
advanceClocks(time::milliseconds(20), 60);
Interest interest("/ndn/CA/INFO");
@@ -68,10 +68,10 @@
BOOST_CHECK(security::verifySignature(response, cert));
auto contentBlock = response.getContent();
contentBlock.parse();
- auto caItem = INFO::decodeClientConfigFromContent(contentBlock);
+ auto caItem = INFO::decodeDataContentToCaProfile(contentBlock);
BOOST_CHECK_EQUAL(caItem.m_caPrefix, "/ndn");
- BOOST_CHECK_EQUAL(caItem.m_probe, "");
- BOOST_CHECK_EQUAL(caItem.m_anchor.wireEncode(), cert.wireEncode());
+ BOOST_CHECK_EQUAL(caItem.m_probeParameterKeys.size(), 0);
+ BOOST_CHECK_EQUAL(caItem.m_cert->wireEncode(), cert.wireEncode());
BOOST_CHECK_EQUAL(caItem.m_caInfo, "ndn testbed ca");
});
face.receive(interest);
@@ -87,7 +87,7 @@
auto cert = key.getDefaultCertificate();
util::DummyClientFace face(io, m_keyChain, {true, true});
- CaModule ca(face, m_keyChain, "tests/unit-tests/ca.conf.test", "ca-storage-memory");
+ CaModule ca(face, m_keyChain, "tests/unit-tests/config-files/config-ca-1", "ca-storage-memory");
ca.setNameAssignmentFunction([&](const std::vector<std::tuple<std::string, std::string>>) -> std::vector<std::string> {
std::vector<std::string> result;
result.push_back("example");
@@ -130,7 +130,7 @@
auto cert = key.getDefaultCertificate();
util::DummyClientFace face(io, m_keyChain, {true, true});
- CaModule ca(face, m_keyChain, "tests/unit-tests/ca.conf.test", "ca-storage-memory");
+ CaModule ca(face, m_keyChain, "tests/unit-tests/config-files/config-ca-1", "ca-storage-memory");
advanceClocks(time::milliseconds(20), 60);
Interest interest("/ndn/CA/PROBE");
@@ -168,13 +168,13 @@
auto cert = key.getDefaultCertificate();
util::DummyClientFace face(io, m_keyChain, {true, true});
- CaModule ca(face, m_keyChain, "tests/unit-tests/ca.conf.test", "ca-storage-memory");
+ CaModule ca(face, m_keyChain, "tests/unit-tests/config-files/config-ca-1", "ca-storage-memory");
advanceClocks(time::milliseconds(20), 60);
ClientModule client(m_keyChain);
- ClientCaItem item;
+ CaConfigItem item;
item.m_caPrefix = Name("/ndn");
- item.m_anchor = cert;
+ item.m_cert = std::make_shared<security::v2::Certificate>(cert);
client.getClientConf().m_caItems.push_back(item);
auto interest = client.generateNewInterest(time::system_clock::now(),
@@ -219,13 +219,13 @@
auto cert = key.getDefaultCertificate();
util::DummyClientFace face(io, m_keyChain, {true, true});
- CaModule ca(face, m_keyChain, "tests/unit-tests/ca.conf.test");
+ CaModule ca(face, m_keyChain, "tests/unit-tests/config-files/config-ca-1");
advanceClocks(time::milliseconds(20), 60);
ClientModule client(m_keyChain);
- ClientCaItem item;
+ CaConfigItem item;
item.m_caPrefix = Name("/ndn");
- item.m_anchor = cert;
+ item.m_cert = std::make_shared<security::v2::Certificate>(cert);
client.getClientConf().m_caItems.push_back(item);
auto current_tp = time::system_clock::now();
auto interest1 = client.generateNewInterest(current_tp, current_tp - time::hours(1),
@@ -255,13 +255,13 @@
auto cert = key.getDefaultCertificate();
util::DummyClientFace face(io, m_keyChain, {true, true});
- CaModule ca(face, m_keyChain, "tests/unit-tests/ca.conf.test", "ca-storage-memory");
+ CaModule ca(face, m_keyChain, "tests/unit-tests/config-files/config-ca-1", "ca-storage-memory");
advanceClocks(time::milliseconds(20), 60);
ClientModule client(m_keyChain);
- ClientCaItem item;
+ CaConfigItem item;
item.m_caPrefix = Name("/ndn");
- item.m_anchor = cert;
+ item.m_cert = std::make_shared<security::v2::Certificate>(cert);
client.getClientConf().m_caItems.push_back(item);
auto interest1 = client.generateNewInterest(time::system_clock::now(),
@@ -300,13 +300,13 @@
auto cert = key.getDefaultCertificate();
util::DummyClientFace face(io, m_keyChain, {true, true});
- CaModule ca(face, m_keyChain, "tests/unit-tests/ca.conf.test");
+ CaModule ca(face, m_keyChain, "tests/unit-tests/config-files/config-ca-1");
advanceClocks(time::milliseconds(20), 60);
ClientModule client(m_keyChain);
- ClientCaItem item;
+ CaConfigItem item;
item.m_caPrefix = Name("/ndn");
- item.m_anchor = cert;
+ item.m_cert = std::make_shared<security::v2::Certificate>(cert);
client.getClientConf().m_caItems.push_back(item);
auto current_tp = time::system_clock::now();
auto interest1 = client.generateNewInterest(current_tp, current_tp + time::days(1), Name("/ndn"));
@@ -330,14 +330,14 @@
auto cert = key.getDefaultCertificate();
util::DummyClientFace face(io, m_keyChain, {true, true});
- CaModule ca(face, m_keyChain, "tests/unit-tests/ca.conf.test", "ca-storage-memory");
+ CaModule ca(face, m_keyChain, "tests/unit-tests/config-files/config-ca-1", "ca-storage-memory");
advanceClocks(time::milliseconds(20), 60);
// generate NEW Interest
ClientModule client(m_keyChain);
- ClientCaItem item;
+ CaConfigItem item;
item.m_caPrefix = Name("/ndn");
- item.m_anchor = cert;
+ item.m_cert = std::make_shared<security::v2::Certificate>(cert);
client.getClientConf().m_caItems.push_back(item);
auto newInterest = client.generateNewInterest(time::system_clock::now(),
time::system_clock::now() + time::days(1), Name("/ndn/zhiyi"));
@@ -413,7 +413,7 @@
auto cert = key.getDefaultCertificate();
util::DummyClientFace face(io, {true, true});
- CaModule ca(face, m_keyChain, "tests/unit-tests/ca.conf.test", "ca-storage-memory");
+ CaModule ca(face, m_keyChain, "tests/unit-tests/config-files/config-ca-1", "ca-storage-memory");
advanceClocks(time::milliseconds(20), 60);
//generate a certificate
@@ -432,9 +432,9 @@
auto issuedCert = ca.issueCertificate(certRequest);
ClientModule client(m_keyChain);
- ClientCaItem item;
- item.m_caName = Name("/ndn");
- item.m_anchor = cert;
+ CaConfigItem item;
+ item.m_caPrefix = Name("/ndn");
+ item.m_cert = std::make_shared<security::v2::Certificate>(cert);
client.getClientConf().m_caItems.push_back(item);
auto interest = client.generateRevokeInterest(issuedCert);
@@ -477,7 +477,7 @@
auto cert = key.getDefaultCertificate();
util::DummyClientFace face(io, {true, true});
- CaModule ca(face, m_keyChain, "tests/unit-tests/ca.conf.test", "ca-storage-memory");
+ CaModule ca(face, m_keyChain, "tests/unit-tests/config-files/config-ca-1", "ca-storage-memory");
advanceClocks(time::milliseconds(20), 60);
//generate a certificate
@@ -494,9 +494,9 @@
m_keyChain.sign(clientCert, signingByKey(clientKey.getName()).setSignatureInfo(signatureInfo));
ClientModule client(m_keyChain);
- ClientCaItem item;
- item.m_caName = Name("/ndn");
- item.m_anchor = cert;
+ CaConfigItem item;
+ item.m_caPrefix = Name("/ndn");
+ item.m_cert = std::make_shared<security::v2::Certificate>(cert);
client.getClientConf().m_caItems.push_back(item);
auto interest = client.generateRevokeInterest(clientCert);