diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-11-16 11:01:50 +0100 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-11-16 11:12:02 +0100 |
commit | e0f2275894daeb268180648ceb5488f45757d592 (patch) | |
tree | 3b417d9ce50cad84dfd1bdcafb46924ace57d9de /lib | |
parent | 8c72fd4555dc5637316564895ec3271b40389497 (diff) | |
download | meta-updater-e0f2275894daeb268180648ceb5488f45757d592.tar.gz |
aktualizr: Bump to latest and fix names.
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/oeqa/selftest/cases/updater.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index e4b2fa5..eb43994 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py | |||
@@ -103,7 +103,7 @@ class AktualizrToolsTests(OESelftestTestCase): | |||
103 | bitbake('aktualizr-native') | 103 | bitbake('aktualizr-native') |
104 | 104 | ||
105 | def test_cert_provider_help(self): | 105 | def test_cert_provider_help(self): |
106 | akt_native_run(self, 'aktualizr_cert_provider --help') | 106 | akt_native_run(self, 'aktualizr-cert-provider --help') |
107 | 107 | ||
108 | def test_cert_provider_local_output(self): | 108 | def test_cert_provider_local_output(self): |
109 | logger = logging.getLogger("selftest") | 109 | logger = logging.getLogger("selftest") |
@@ -115,7 +115,7 @@ class AktualizrToolsTests(OESelftestTestCase): | |||
115 | bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-ca-implicit-prov') | 115 | bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-ca-implicit-prov') |
116 | config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov_ca.toml' | 116 | config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov_ca.toml' |
117 | 117 | ||
118 | akt_native_run(self, 'aktualizr_cert_provider -c {creds} -r -l {temp} -g {config}' | 118 | akt_native_run(self, 'aktualizr-cert-provider -c {creds} -r -l {temp} -g {config}' |
119 | .format(creds=creds, temp=temp_dir, config=config)) | 119 | .format(creds=creds, temp=temp_dir, config=config)) |
120 | 120 | ||
121 | # Might be nice if these names weren't hardcoded. | 121 | # Might be nice if these names weren't hardcoded. |
@@ -424,14 +424,14 @@ class ImplProvTests(OESelftestTestCase): | |||
424 | self.assertIn(b'Fetched metadata: no', stdout, | 424 | self.assertIn(b'Fetched metadata: no', stdout, |
425 | 'Device already provisioned!? ' + stderr.decode() + stdout.decode()) | 425 | 'Device already provisioned!? ' + stderr.decode() + stdout.decode()) |
426 | 426 | ||
427 | # Run cert_provider. | 427 | # Run aktualizr-cert-provider. |
428 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native') | 428 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native') |
429 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] | 429 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] |
430 | bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-ca-implicit-prov') | 430 | bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-ca-implicit-prov') |
431 | config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov_ca.toml' | 431 | config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov_ca.toml' |
432 | 432 | ||
433 | print('Provisining at root@localhost:%d' % self.qemu.ssh_port) | 433 | print('Provisining at root@localhost:%d' % self.qemu.ssh_port) |
434 | akt_native_run(self, 'aktualizr_cert_provider -c {creds} -t root@localhost -p {port} -s -u -r -g {config}' | 434 | akt_native_run(self, 'aktualizr-cert-provider -c {creds} -t root@localhost -p {port} -s -u -r -g {config}' |
435 | .format(creds=creds, port=self.qemu.ssh_port, config=config)) | 435 | .format(creds=creds, port=self.qemu.ssh_port, config=config)) |
436 | 436 | ||
437 | verifyProvisioned(self, machine) | 437 | verifyProvisioned(self, machine) |
@@ -509,13 +509,13 @@ class HsmTests(OESelftestTestCase): | |||
509 | self.assertNotEqual(retcode, 0, 'softhsm2-tool succeeded before initialization: ' + | 509 | self.assertNotEqual(retcode, 0, 'softhsm2-tool succeeded before initialization: ' + |
510 | stdout.decode() + stderr.decode()) | 510 | stdout.decode() + stderr.decode()) |
511 | 511 | ||
512 | # Run cert_provider. | 512 | # Run aktualizr-cert-provider. |
513 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native') | 513 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native') |
514 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] | 514 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] |
515 | bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-hsm-prov') | 515 | bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-hsm-prov') |
516 | config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_hsm_prov.toml' | 516 | config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_hsm_prov.toml' |
517 | 517 | ||
518 | akt_native_run(self, 'aktualizr_cert_provider -c {creds} -t root@localhost -p {port} -r -s -u -g {config}' | 518 | akt_native_run(self, 'aktualizr-cert-provider -c {creds} -t root@localhost -p {port} -r -s -u -g {config}' |
519 | .format(creds=creds, port=self.qemu.ssh_port, config=config)) | 519 | .format(creds=creds, port=self.qemu.ssh_port, config=config)) |
520 | 520 | ||
521 | # Verify that HSM is able to initialize. | 521 | # Verify that HSM is able to initialize. |