Extract common upgrade scenarios code in a base class

AdmiralUpgradeIT contained a lot of code that is going to be reused by upcomming upgrade tests so it was extracted to AdmiralUpgradeBaseIT which AdmiralUpgradeIT now extends. There are virtually no other changes here with the following exceptions: - in changeBaseURI the passed container state was ignored and the master state was used. This is now fixed - a new method "deleteApplicationAfter" was added. It marks a composite component link for app deletion after test execution - addContentToTheProvisionedAdmiral no longer updates the return value of the getResourceDescriptionLink method. Now, the link to the imported template is stored in a local variable. Change-Id: I871d0d82d6f950c5bd5dea0ca5c499a9ffe6e519 Reviewed-on: https://bellevue-ci.eng.vmware.com:8080/36704 Upgrade-Verified: jenkins <[email protected]> Closures-Verified: jenkins <[email protected]> CS-Verified: jenkins <[email protected]> Reviewed-by: Georgi Muleshkov <[email protected]> Bellevue-Verified: jenkins <[email protected]>
afilipov1 · Jun 25, 2018 · 69af6ff · 69af6ff
1 parent e887a27
commit 69af6ff
Show file tree

Hide file tree

Showing 2 changed files with 267 additions and 239 deletions.
diff --git a/test-upgrade/src/test/java/com/vmware/admiral/test/integration/AdmiralUpgradeBaseIT.java b/test-upgrade/src/test/java/com/vmware/admiral/test/integration/AdmiralUpgradeBaseIT.java
@@ -0,0 +1,265 @@
+/*
+ * Copyright (c) 2018 VMware, Inc. All Rights Reserved.
+ *
+ * This product is licensed to you under the Apache License, Version 2.0 (the "License").
+ * You may not use this product except in compliance with the License.
+ *
+ * This product may include a number of subcomponents with separate copyright notices
+ * and license terms. Your use of these subcomponents is subject to the terms and
+ * conditions of the subcomponent's license, as noted in the LICENSE file.
+ */
+
+package com.vmware.admiral.test.integration;
+
+import static org.junit.Assert.assertTrue;
+
+import java.net.URI;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+import com.vmware.admiral.common.ManagementUriParts;
+import com.vmware.admiral.common.util.ServiceClientFactory;
+import com.vmware.admiral.compute.ContainerHostService;
+import com.vmware.admiral.compute.ContainerHostService.DockerAdapterType;
+import com.vmware.admiral.compute.ElasticPlacementZoneConfigurationService.ElasticPlacementZoneConfigurationState;
+import com.vmware.admiral.compute.container.ContainerHostDataCollectionService;
+import com.vmware.admiral.compute.container.ContainerHostDataCollectionService.ContainerHostDataCollectionState;
+import com.vmware.admiral.compute.container.ContainerService.ContainerState;
+import com.vmware.admiral.service.common.NodeHealthCheckService;
+import com.vmware.admiral.service.common.NodeMigrationService;
+import com.vmware.admiral.service.common.NodeMigrationService.MigrationRequest;
+import com.vmware.admiral.test.integration.SimpleHttpsClient.HttpMethod;
+import com.vmware.admiral.test.integration.SimpleHttpsClient.HttpResponse;
+import com.vmware.admiral.test.integration.data.IntegratonTestStateFactory;
+import com.vmware.photon.controller.model.resources.ComputeService;
+import com.vmware.photon.controller.model.resources.ComputeService.ComputeState;
+import com.vmware.xenon.common.Operation;
+import com.vmware.xenon.common.ServiceClient;
+import com.vmware.xenon.common.Utils;
+import com.vmware.xenon.services.common.AuthCredentialsService;
+import com.vmware.xenon.services.common.AuthCredentialsService.AuthCredentialsServiceState;
+import com.vmware.xenon.services.common.ServiceUriPaths;
+
+public abstract class AdmiralUpgradeBaseIT extends BaseProvisioningOnCoreOsIT {
+    private static final String DOCUMENT_LINKS = "documentLinks";
+    private static final String TEMPLATE_HELLO_WORLD_NETWORK = "HelloWorld_network.yaml";
+
+    private static final String SEPARATOR = "/";
+    private static final String EXPAND = "?expand";
+
+    private static final String CREDENTIALS_SELF_LINK = AuthCredentialsService.FACTORY_LINK
+            + SEPARATOR + IntegratonTestStateFactory.AUTH_CREDENTIALS_ID;
+    private static final String COMPUTE_SELF_LINK = ComputeService.FACTORY_LINK + SEPARATOR
+            + IntegratonTestStateFactory.DOCKER_COMPUTE_ID;
+
+    private Set<String> applicationsToDelete = new HashSet<>();
+
+    protected static ServiceClient serviceClient;
+
+    @BeforeClass
+    public static void beforeClass() {
+        serviceClient = ServiceClientFactory.createServiceClient(null);
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        try {
+            serviceClient.stop();
+        } catch (Exception ignore) {
+        }
+    }
+
+    protected void migrateData(ContainerState sourceContainer, ContainerState targetContainer)
+            throws Exception {
+        // wait for the admiral container to start. In 0.9.1 health check service is not available.
+        // This is needed in case only validated is run
+        Thread.sleep(30000);
+        String parent = targetContainer.parentLink;
+        ComputeState computeState = getDocument(parent, ComputeState.class);
+        String source = String.format("http://%s:%s", computeState.address,
+                sourceContainer.ports.get(0).hostPort) + ServiceUriPaths.DEFAULT_NODE_GROUP;
+
+        changeBaseURI(targetContainer);
+
+        MigrationRequest migrationRequest = new MigrationRequest();
+        migrationRequest.sourceNodeGroup = source;
+        try {
+            logger.info("---------- Send migration request. --------");
+            sendRequest(HttpMethod.POST, NodeMigrationService.SELF_LINK,
+                    Utils.toJson(migrationRequest));
+        } finally {
+            setBaseURI(null);
+        }
+
+    }
+
+    protected void removeData(ContainerState admiralContainer) throws Exception {
+        changeBaseURI(admiralContainer);
+        if (!applicationsToDelete.isEmpty()) {
+            // Wait until certificates are reloaded on Docker hosts in order to avoid [General SSL
+            // engine] error.
+            Thread.sleep(60000);
+            requestContainerDelete(applicationsToDelete, false);
+        }
+        delete(COMPUTE_SELF_LINK);
+        delete(CREDENTIALS_SELF_LINK);
+        setBaseURI(null);
+
+    }
+
+    protected void validateContent(ContainerState admiralContainer) throws Exception {
+        logger.info("---------- Validate compatibility. --------");
+        changeBaseURI(admiralContainer);
+        // wait for the admiral container to start
+        URI uri = URI.create(getBaseUrl() + NodeHealthCheckService.SELF_LINK);
+        waitForStatusCode(uri, Operation.STATUS_CODE_OK);
+        uri = URI.create(getBaseUrl() + ManagementUriParts.CONTAINERS);
+        waitForStatusCode(uri, Operation.STATUS_CODE_OK);
+        uri = URI.create(getBaseUrl() + ManagementUriParts.CONTAINER_HOSTS);
+        waitForStatusCode(uri, Operation.STATUS_CODE_OK);
+
+        com.vmware.admiral.test.integration.client.ComputeState dockerHost = getDocument(
+                COMPUTE_SELF_LINK,
+                com.vmware.admiral.test.integration.client.ComputeState.class);
+        assertTrue(dockerHost != null);
+        // Run the data collection in order to update the host
+        ContainerHostDataCollectionState dataCollectionBody = new ContainerHostDataCollectionState();
+        sendRequest(HttpMethod.PATCH,
+                ContainerHostDataCollectionService.HOST_INFO_DATA_COLLECTION_LINK,
+                Utils.toJson(dataCollectionBody));
+        waitForStateChange(COMPUTE_SELF_LINK, (body) -> {
+            if (body == null) {
+                return false;
+            }
+            com.vmware.admiral.test.integration.client.ComputeState host = Utils.fromJson(body,
+                    com.vmware.admiral.test.integration.client.ComputeState.class);
+            // trust alias custom property must be set eventually after upgrade
+            return (host.customProperties
+                    .get(ContainerHostService.SSL_TRUST_ALIAS_PROP_NAME) != null);
+        });
+
+        com.vmware.admiral.test.integration.client.AuthCredentialsServiceState credentials = getDocument(
+                CREDENTIALS_SELF_LINK,
+                com.vmware.admiral.test.integration.client.AuthCredentialsServiceState.class);
+        assertTrue(credentials != null);
+
+        // container
+        validateResources(ManagementUriParts.CONTAINERS,
+                com.vmware.admiral.test.integration.client.ContainerState.class);
+
+        // application
+        validateResources(ManagementUriParts.COMPOSITE_COMPONENT,
+                com.vmware.admiral.test.integration.client.CompositeComponent.class);
+
+        // network
+        validateResources(ManagementUriParts.CONTAINER_NETWORKS,
+                com.vmware.admiral.test.integration.client.ContainerNetworkState.class);
+
+        // event-log
+        validateResources(ManagementUriParts.EVENT_LOG,
+                com.vmware.admiral.test.integration.client.EventLogState.class);
+
+        // request-status
+        validateResources(ManagementUriParts.REQUEST_STATUS,
+                com.vmware.admiral.test.integration.client.ContainerRequestStatus.class);
+
+        // placement
+        validateResources(ManagementUriParts.RESOURCE_GROUP_PLACEMENTS,
+                com.vmware.admiral.test.integration.client.GroupResourcePlacementState.class);
+
+        // composite-description (template)
+        validateResources(ManagementUriParts.COMPOSITE_DESC,
+                com.vmware.admiral.test.integration.client.CompositeDescription.class);
+
+         // certificate
+        validateResources(ManagementUriParts.SSL_TRUST_CERTS,
+                com.vmware.admiral.test.integration.client.SslTrustCertificateState.class);
+
+        // placement zone
+        validateResources(ManagementUriParts.ELASTIC_PLACEMENT_ZONE_CONFIGURATION,
+                com.vmware.admiral.test.integration.client.ElasticPlacementZoneConfigurationState.class);
+
+        setBaseURI(null);
+    }
+
+    protected void changeBaseURI(ContainerState admiralContainer) throws Exception {
+        String parent = admiralContainer.parentLink;
+        ComputeState computeState = getDocument(parent, ComputeState.class);
+        setBaseURI(String.format("http://%s:%s", computeState.address,
+                admiralContainer.ports.get(0).hostPort));
+    }
+
+    protected void addContentToTheProvisionedAdmiral(ContainerState admiralContainer)
+            throws Exception {
+        changeBaseURI(admiralContainer);
+        // wait for the admiral container to start. In 0.9.1 health check service is not available
+        Thread.sleep(20000);
+        URI uri = URI.create(getBaseUrl() + ManagementUriParts.CONTAINERS);
+        waitForStatusCode(uri, Operation.STATUS_CODE_OK);
+        uri = URI.create(getBaseUrl() + ManagementUriParts.CONTAINER_HOSTS);
+        waitForStatusCode(uri, Operation.STATUS_CODE_OK);
+        // Create event. The template does not exist on the new admiral host
+        boolean requestContainerFailed = false;
+        try {
+            requestContainer(getResourceDescriptionLink(false, RegistryType.V1_SSL_SECURE));
+        } catch (Exception e) {
+            // Do nothing we want the request to fail in order to create an event
+            requestContainerFailed = true;
+        }
+        if (!requestContainerFailed) {
+            throw new IllegalStateException("Container request was expected to fail!");
+        }
+
+        // create documents to check for after upgrade
+        String templateLink = importTemplate(serviceClient, TEMPLATE_HELLO_WORLD_NETWORK);
+        // try to provision in order to create an event state
+        setupCoreOsHost(DockerAdapterType.API, false, null);
+        // provision an application with network
+        requestContainer(templateLink);
+
+        AuthCredentialsServiceState credentials = IntegratonTestStateFactory
+                .createAuthCredentials(false);
+        postDocument(AuthCredentialsService.FACTORY_LINK, credentials);
+
+        // placement zone
+        ElasticPlacementZoneConfigurationState epzConfigState = new ElasticPlacementZoneConfigurationState();
+        epzConfigState.resourcePoolState = IntegratonTestStateFactory.createResourcePool();
+        postDocument(ManagementUriParts.ELASTIC_PLACEMENT_ZONE_CONFIGURATION, epzConfigState);
+
+        setBaseURI(null);
+    }
+
+    private <T> void validateResources(String endpoint, Class<? extends T> clazz)
+            throws Exception {
+        HttpResponse response = SimpleHttpsClient.execute(HttpMethod.GET,
+                getBaseUrl() + buildServiceUri(endpoint + EXPAND), null, null);
+        assertTrue(response.statusCode == 200);
+        JsonElement json = new JsonParser().parse(response.responseBody);
+        JsonObject jsonObject = json.getAsJsonObject();
+        JsonArray documentLinks =  jsonObject.getAsJsonArray(DOCUMENT_LINKS);
+        assertTrue(documentLinks.size() > 0);
+        for (int i = 0; i < documentLinks.size(); i++) {
+            String selfLink = documentLinks.get(i).getAsString();
+            T state = getDocument(selfLink, clazz);
+            assertTrue(state != null);
+            // add applications created in the initialization phase for deletion
+            if (com.vmware.admiral.test.integration.client.CompositeComponent.class.equals(clazz)) {
+                deleteApplicationAfter(selfLink);
+            }
+        }
+    }
+
+    protected void deleteApplicationAfter(String compositeLink) {
+        if (compositeLink != null) {
+            applicationsToDelete.add(compositeLink);
+        }
+    }
+}