Merge ~rmescandon/snappy-hwe-snaps/+git/engineering-tests:serial-vault-corrections into ~snappy-hwe-team/snappy-hwe-snaps/+git/engineering-tests:master

[Roberto Mier Escandon]

- Renamed back serial-vault-server to serial-vault
- Padding adjustment
- Updated some not correct tests content
- Verified manually everything

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:62e542ab7b46a796d7d7a3ba7b4ea1fec55bafef
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1937/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/3349
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1845/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3609
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/2805/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1937/rebuild

review: Approve (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

minor thing

review: Needs Fixing (code)

[Konrad Zapałowicz (kzapalowicz)]

ack

review: Approve (code)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:943b774da2701a4980ad44cc8a7f0f5a9356bbae
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1938/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/3350
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1846/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3610
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/2806/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1938/rebuild

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

diff --git a/com.canonical.se:engineering-tests/units/serial-vault/serial-vault.pxu b/com.canonical.se:engineering-tests/units/serial-vault/serial-vault.pxu
index ab1bea1..e01dfe5 100644
--- a/com.canonical.se:engineering-tests/units/serial-vault/serial-vault.pxu
+++ b/com.canonical.se:engineering-tests/units/serial-vault/serial-vault.pxu
@@ -13,14 +13,14 @@ category_id: serial_vault
 _description: Ensure that the serial-vault interface is auto-connected
 plugin: manual
 _steps:
-  1. List the interfaces
-  .
-    $ snap interfaces | serial-vault-server
-  .
+ 1. List the interfaces
+ .
+  $ snap interfaces serial-vault
+ .
 _verification:
   Verify that you see the following:
-  :network                   serial-vault-server
-  :network-bind              serial-vault-server
+  :network                   serial-vault
+  :network-bind              serial-vault
 
 id: serial_vault/setup/config
 category_id: serial_vault
@@ -28,37 +28,35 @@ _description: Ensure that the serial-vault can access database
 plugin: manual
 depends: serial_vault/setup/ensure_interface_connection_setup
 _steps:
-  1. Create settings.yaml with proper content ot access database
-  .
-    $ cat <<-EOF > settings.yaml
-	title: "Serial Vault"
-	logo: "/static/images/logo-ubuntu-white.svg"
-	mode: signing
-	docRoot: "."
-	driver: "postgres"
-	datasource: "dbname=serialvault sslmode=disable"
-	keystore: "database"
-	keystoreSecret: "secret code to encrypt the auth-key hash"
-	csrfAuthKey: "2E6ZYnVYUfDLRLV/ne8M6v1jyB/376BL9ORnN3Kgb04uSFalr2ygReVsOt0PaGEIRuID10TePBje5xdjIOEjQQ=="
-	urlHost: "serial-vault"
-	urlScheme: http
-	enableUserAuth: True
-  	  EOF
-  .
-  2. Apply config
-  .
-    $ cat settings.yaml | sudo serial-vault-server.config
-  .
-  3. Restart service
-  .
-  	$ sudo systemctl restart snap.serial-vault-server.serial-vault.service
-  .
-  4. Check journal
-  .
-  	$ sudo journalctl
-  .
+ 1. Create settings.yaml with proper content to access database. For example:
+ .
+  title: "Serial Vault"
+  logo: "/static/images/logo-ubuntu-white.svg"
+  mode: signing
+  docRoot: "."
+  driver: "postgres"
+  datasource: "dbname=serialvault sslmode=disable"
+  keystore: "database"
+  keystoreSecret: "secret code to encrypt the auth-key hash"
+  csrfAuthKey: "2E6ZYnVYUfDLRLV/ne8M6v1jyB/376BL9ORnN3Kgb04uSFalr2ygReVsOt0PaGEIRuID10TePBje5xdjIOEjQQ=="
+  urlHost: "serial-vault"
+  urlScheme: http
+  enableUserAuth: True
+ .
+ 2. Apply config
+ .
+  $ cat settings.yaml | sudo serial-vault.config
+ .
+ 3. Restart service
+ .
+  $ sudo systemctl restart snap.serial-vault.service.service
+ .
+ 4. Check service status
+ .
+  $ sudo systemctl status snap.serial-vault.service.service
+ .
 _verification:
-  Verify that you see in journal last page (Alt+G) that database has been created/updated and service is up and running, like this:
+  Verify that you see that service is active (running) and that the database has been created/updated, like this:
   Created the 'keypair' table.
   Created the 'model' table.
   Created the 'settings' table.
@@ -79,14 +77,14 @@ _description: Ensure that the serial vault admin commands can be run
 plugin: manual
 depends: serial_vault/setup/config
 _steps:
-  1. Try to run admin
-  .
-    $ serial-vault-server.admin
-  .
-  2. Try to run config
-  .
-    $ serial-vault-server.config
-  .
+ 1. Try to run admin
+ .
+  $ serial-vault.admin
+ .
+ 2. Try to run config
+ .
+  $ serial-vault.config
+ .
 _verification:
   Verify that each step ends showing up the help
 
@@ -96,14 +94,14 @@ _description: Ensure admin tool can add a superuser
 plugin: manual
 depends: serial_vault/operation/ensure-commands-can-be-run
 _steps:
-  1. Add a user from console
-  .
-    $ serial-vault-server.admin user add theuser -n TheName -r superuser -e [e-mail]
-  .
-  2. List users
-  .
-    $ serial-vault-server.admin user list
-  .
+ 1. Add a user from console
+ .
+  $ serial-vault.admin user add theuser -n TheName -r superuser -e [e-mail]
+ .
+ 2. List users
+ .
+  $ serial-vault.admin user list
+ .
 _verification:
   Verify that just created user is in users list with superuser role
 
@@ -113,16 +111,12 @@ _description: Ensure admin tool can fetch store cached account assertions
 plugin: manual
 depends: serial_vault/operation/ensure-commands-can-be-run
 _steps:
-  1. Fetch cached accounts from the store
-  .
-    $ serial-vault-server.admin account cache
-  .
-  2. List users
-  .
-    $ serial-vault-server.admin user list
-  .
+ 1. Fetch cached accounts from the store
+ .
+  $ serial-vault.admin account cache
+ .
 _verification:
-  Verify that just created user is in users list with superuser role
+  Verify that output shows account and keypair processing from Ubuntu store
 
 id: serial_vault/operation/verify_api_is_reachable
 category_id: serial_vault
@@ -130,9 +124,9 @@ _description: Ensure signing service can be reached
 plugin: manual
 depends: serial_vault/operation/ensure-commands-can-be-run
 _steps:
-  1. Request service version
-  .
-    $ wget http://localhost:8080/v1/version
-  .
+ 1. Request service version
+ .
+  $ wget http://localhost:8080/v1/version
+ .
 _verification:
-  Verify that the response content is {"version":"1.6.0"}
+  Verify that the response content is {"version":"2.0-0"}