Add test for migration of old ip secondaries systems

Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>

src/aktualizr_primary/CMakeLists.txt

@@ -1,14 +1,17 @@
-set(TARGET aktualizr)
-set(SOURCES main.cc secondary_config.h secondary_config.cc secondary.h secondary.cc)
+set(SOURCES main.cc secondary_config.cc secondary.cc)
+set(HEADERS secondary_config.h secondary.h)
 
-add_executable(${TARGET} ${SOURCES} $<TARGET_OBJECTS:aktualizr-posix>)
-target_link_libraries(${TARGET} aktualizr_lib virtual_secondary)
-target_include_directories(${TARGET} PUBLIC
+add_executable(aktualizr ${SOURCES} $<TARGET_OBJECTS:aktualizr-posix>)
+target_link_libraries(aktualizr aktualizr_lib virtual_secondary)
+target_include_directories(aktualizr PUBLIC
   ${PROJECT_SOURCE_DIR}/src/libaktualizr-posix
   ${PROJECT_SOURCE_DIR}/third_party)
 
-aktualizr_source_file_checks(${SOURCES})
-
 install(TARGETS aktualizr RUNTIME DESTINATION bin COMPONENT aktualizr)
 
+add_aktualizr_test(NAME primary_secondary_registration SOURCES primary_secondary_registration_test.cc secondary.cc secondary_config.cc PROJECT_WORKING_DIRECTORY ARGS ${PROJECT_BINARY_DIR}/uptane_repos LIBRARIES PUBLIC aktualizr-posix virtual_secondary uptane_generator_lib)
+target_include_directories(t_primary_secondary_registration PUBLIC ${PROJECT_SOURCE_DIR}/src/libaktualizr-posix)
+
+aktualizr_source_file_checks(${SOURCES} ${HEADERS} ${TEST_SOURCES})
+
 # vim: set tabstop=4 shiftwidth=4 expandtab:

src/aktualizr_primary/primary_secondary_registration_test.cc

@@ -0,0 +1,127 @@
+#include <gtest/gtest.h>
+
+#include "httpfake.h"
+#include "primary/aktualizr.h"
+#include "secondary.h"
+#include "uptane_test_common.h"
+#include "utilities/utils.h"
+
+boost::filesystem::path uptane_repos_dir;
+boost::filesystem::path fake_meta_dir;
+
+TEST(PrimarySecondaryReg, SecondariesMigration) {
+  // This tests that a device that had an ip secondary will still find it after
+  // recent changes, even if it does not connect when the device starts
+
+  TemporaryDirectory temp_dir;
+  auto http = std::make_shared<HttpFake>(temp_dir.Path(), "noupdates", fake_meta_dir);
+
+  const auto& url = http->tls_server;
+  Config conf("tests/config/basic.toml");
+  conf.uptane.director_server = url + "/director";
+  conf.uptane.repo_server = url + "/repo";
+  conf.provision.server = url;
+  conf.provision.primary_ecu_serial = "CA:FE:A6:D2:84:9D";
+  conf.provision.primary_ecu_hardware_id = "primary_hw";
+  conf.storage.path = temp_dir.Path();
+  conf.import.base_path = temp_dir.Path() / "import";
+  conf.tls.server = url;
+  conf.bootloader.reboot_sentinel_dir = temp_dir.Path();
+  const boost::filesystem::path sec_conf_path = temp_dir / "s_config.json";
+  conf.uptane.secondary_config_file = sec_conf_path;
+
+  Json::Value sec_conf;
+
+  auto storage = INvStorage::newStorage(conf.storage);
+
+  const Uptane::EcuSerial primary_serial{"p_serial"};
+  const Uptane::EcuSerial secondary_serial{"s_serial"};
+  const Uptane::HardwareIdentifier primary_hwid{"p_hwid"};
+  const Uptane::HardwareIdentifier secondary_hwid{"s_hwid"};
+
+  {
+    // prepare storage the "old" way:
+    storage->storeDeviceId("device");
+    storage->storeEcuSerials({{primary_serial, primary_hwid}, {secondary_serial, secondary_hwid}});
+    storage->storeEcuRegistered();
+
+    sec_conf["IP"]["secondary_wait_port"] = 9030;
+    sec_conf["IP"]["secondary_wait_timeout"] = 1;
+    sec_conf["IP"]["secondaries"] = Json::arrayValue;
+    sec_conf["IP"]["secondaries"][0]["addr"] = "127.0.0.1:9061";
+    Utils::writeFile(sec_conf_path, sec_conf);
+  }
+
+  {
+    // verifies that aktualizr can still start if it can't connect to its
+    // secondary
+
+    UptaneTestCommon::TestAktualizr aktualizr(conf, storage, http);
+    Primary::initSecondaries(aktualizr, sec_conf_path);
+    aktualizr.Initialize();
+    aktualizr.CheckUpdates().get();
+
+    std::vector<SecondaryInfo> secs_info;
+    storage->loadSecondariesInfo(&secs_info);
+    EXPECT_EQ(secs_info[0].serial.ToString(), secondary_serial.ToString());
+    EXPECT_EQ(secs_info[0].type, "IP");
+    EXPECT_EQ(secs_info[0].extra, R"({"ip":"127.0.0.1","port":9061})");
+  }
+
+  const Uptane::EcuSerial secondary_serial2{"s_serial2"};
+  const Uptane::HardwareIdentifier secondary_hwid2{"s_hwid2"};
+  {
+    // prepare the storage the "old" way with two secondaries
+    storage->clearEcuSerials();
+    storage->storeEcuSerials({
+        {primary_serial, primary_hwid},
+        {secondary_serial, secondary_hwid},
+        {secondary_serial2, secondary_hwid2},
+    });
+
+    sec_conf["IP"]["secondaries"][1]["addr"] = "127.0.0.1:9062";
+    Utils::writeFile(sec_conf_path, sec_conf);
+  }
+
+  {
+    UptaneTestCommon::TestAktualizr aktualizr(conf, storage, http);
+
+    // this will fail to actually register the secondaries as there is no way to
+    // tell them apart (since they haven't connected)
+    // however, we still allow aktualizr to go through in case we would like to
+    // update the primary, to maybe fix this situation
+    Primary::initSecondaries(aktualizr, sec_conf_path);
+    aktualizr.Initialize();
+    aktualizr.CheckUpdates().get();
+
+    // there was no way to correlate info here
+    std::vector<SecondaryInfo> secs_info;
+    storage->loadSecondariesInfo(&secs_info);
+    EXPECT_EQ(secs_info[0].serial.ToString(), secondary_serial.ToString());
+    EXPECT_EQ(secs_info[0].type, "");
+    EXPECT_EQ(secs_info[0].extra, "");
+    EXPECT_EQ(secs_info[1].serial.ToString(), secondary_serial2.ToString());
+    EXPECT_EQ(secs_info[1].type, "");
+    EXPECT_EQ(secs_info[1].extra, "");
+  }
+}
+
+#ifndef __NO_MAIN__
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  if (argc != 2) {
+    std::cerr << "Error: " << argv[0] << " requires the path to the base directory of uptane repos.\n";
+    return EXIT_FAILURE;
+  }
+  uptane_repos_dir = argv[1];
+
+  logger_init();
+  logger_set_threshold(boost::log::trivial::trace);
+
+  TemporaryDirectory tmp_dir;
+  fake_meta_dir = tmp_dir.Path();
+  MetaFake meta_fake(fake_meta_dir);
+
+  return RUN_ALL_TESTS();
+}
+#endif