Remove and Rename modules

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 13:48:04 +02:00
parent e30748dd53
commit 5bb24c78ad
423 changed files with 124 additions and 782 deletions
--- a/examples/hawkbit-example-mgmt-simulator/src/main/java/org/eclipse/hawkbit/mgmt/client/Application.java
+++ b/examples/hawkbit-example-mgmt-simulator/src/main/java/org/eclipse/hawkbit/mgmt/client/Application.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.mgmt.client;
+
+import org.eclipse.hawkbit.feign.core.client.FeignClientConfiguration;
+import org.eclipse.hawkbit.mgmt.client.scenarios.CreateStartedRolloutExample;
+import org.eclipse.hawkbit.mgmt.client.scenarios.GettingStartedDefaultScenario;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import feign.auth.BasicAuthRequestInterceptor;
+
+@SpringBootApplication
+@EnableFeignClients
+@EnableConfigurationProperties(ClientConfigurationProperties.class)
+@Configuration
+@AutoConfigureAfter(FeignClientConfiguration.class)
+@Import(FeignClientConfiguration.class)
+public class Application implements CommandLineRunner {
+
+    @Autowired
+    private ClientConfigurationProperties configuration;
+
+    @Autowired
+    private GettingStartedDefaultScenario gettingStarted;
+
+    @Autowired
+    private CreateStartedRolloutExample gettingStartedRolloutScenario;
+
+    public static void main(final String[] args) {
+        new SpringApplicationBuilder().showBanner(false).sources(Application.class).run(args);
+    }
+
+    @Override
+    public void run(final String... args) throws Exception {
+        if (containsArg("--createrollout", args)) {
+            // run the create and start rollout example
+            gettingStartedRolloutScenario.run();
+        } else {
+            // run the getting started scenario which creates a setup of
+            // distribution set and software modules to be used
+            gettingStarted.run();
+        }
+    }
+
+    @Bean
+    public BasicAuthRequestInterceptor basicAuthRequestInterceptor() {
+        return new BasicAuthRequestInterceptor(configuration.getUsername(), configuration.getPassword());
+    }
+
+    @Bean
+    public GettingStartedDefaultScenario gettingStartedDefaultScenario() {
+        return new GettingStartedDefaultScenario();
+    }
+
+    @Bean
+    public CreateStartedRolloutExample createStartedRolloutExample() {
+        return new CreateStartedRolloutExample();
+    }
+
+    private boolean containsArg(final String containsArg, final String... args) {
+        for (final String arg : args) {
+            if (arg.equalsIgnoreCase(containsArg)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
--- a/examples/hawkbit-example-mgmt-simulator/src/main/java/org/eclipse/hawkbit/mgmt/client/ClientConfigurationProperties.java
+++ b/examples/hawkbit-example-mgmt-simulator/src/main/java/org/eclipse/hawkbit/mgmt/client/ClientConfigurationProperties.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.mgmt.client;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Configuration bean which holds the configuration of the client e.g. the base
+ * URL of the hawkbit-server and the credentials to use the RESTful Management
+ * API.
+ */
+@ConfigurationProperties(prefix = "hawkbit")
+public class ClientConfigurationProperties {
+
+    /**
+     * Update server URI.
+     */
+    private String url = "localhost:8080";
+
+    /**
+     * Update server user name.
+     */
+    private String username = "admin";
+
+    /**
+     * Update server password.
+     */
+    private String password = "admin"; // NOSONAR this password is only used for
+                                       // examples
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(final String url) {
+        this.url = url;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(final String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(final String password) {
+        this.password = password;
+    }
+}
--- a/examples/hawkbit-example-mgmt-simulator/src/main/java/org/eclipse/hawkbit/mgmt/client/scenarios/CreateStartedRolloutExample.java
+++ b/examples/hawkbit-example-mgmt-simulator/src/main/java/org/eclipse/hawkbit/mgmt/client/scenarios/CreateStartedRolloutExample.java
@@ -0,0 +1,108 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.mgmt.client.scenarios;
+
+import java.util.List;
+
+import org.eclipse.hawkbit.mgmt.client.resource.MgmtDistributionSetClientResource;
+import org.eclipse.hawkbit.mgmt.client.resource.MgmtDistributionSetTypeClientResource;
+import org.eclipse.hawkbit.mgmt.client.resource.MgmtRolloutClientResource;
+import org.eclipse.hawkbit.mgmt.client.resource.MgmtSoftwareModuleClientResource;
+import org.eclipse.hawkbit.mgmt.client.resource.MgmtSoftwareModuleTypeClientResource;
+import org.eclipse.hawkbit.mgmt.client.resource.MgmtTargetClientResource;
+import org.eclipse.hawkbit.mgmt.client.resource.builder.DistributionSetBuilder;
+import org.eclipse.hawkbit.mgmt.client.resource.builder.DistributionSetTypeBuilder;
+import org.eclipse.hawkbit.mgmt.client.resource.builder.RolloutBuilder;
+import org.eclipse.hawkbit.mgmt.client.resource.builder.SoftwareModuleAssigmentBuilder;
+import org.eclipse.hawkbit.mgmt.client.resource.builder.SoftwareModuleBuilder;
+import org.eclipse.hawkbit.mgmt.client.resource.builder.SoftwareModuleTypeBuilder;
+import org.eclipse.hawkbit.mgmt.client.resource.builder.TargetBuilder;
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtDistributionSet;
+import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutResponseBody;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModule;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModuleType;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Example for creating and starting a Rollout.
+ *
+ */
+public class CreateStartedRolloutExample {
+
+    /* known software module type name and key */
+    private static final String SM_MODULE_TYPE = "firmware";
+
+    /* known distribution set type name and key */
+    private static final String DS_MODULE_TYPE = SM_MODULE_TYPE;
+
+    @Autowired
+    private MgmtDistributionSetClientResource distributionSetResource;
+
+    @Autowired
+    private MgmtSoftwareModuleClientResource softwareModuleResource;
+
+    @Autowired
+    private MgmtTargetClientResource targetResource;
+
+    @Autowired
+    private MgmtRolloutClientResource rolloutResource;
+
+    @Autowired
+    private MgmtDistributionSetTypeClientResource distributionSetTypeResource;
+
+    @Autowired
+    private MgmtSoftwareModuleTypeClientResource softwareModuleTypeResource;
+
+    /**
+     * Run the Rollout scenario.
+     */
+    public void run() {
+
+        // create three SoftwareModuleTypes
+        final List<MgmtSoftwareModuleType> createdSoftwareModuleTypes = softwareModuleTypeResource
+                .createSoftwareModuleTypes(new SoftwareModuleTypeBuilder().key(SM_MODULE_TYPE).name(SM_MODULE_TYPE)
+                        .maxAssignments(1).build())
+                .getBody();
+
+        // create one DistributionSetType
+        distributionSetTypeResource.createDistributionSetTypes(new DistributionSetTypeBuilder().key(DS_MODULE_TYPE)
+                .name(DS_MODULE_TYPE).mandatorymodules(createdSoftwareModuleTypes.get(0).getModuleId()).build())
+                .getBody();
+
+        // create one DistributionSet
+        final List<MgmtDistributionSet> distributionSetsRest = distributionSetResource.createDistributionSets(
+                new DistributionSetBuilder().name("rollout-example").version("1.0.0").type(DS_MODULE_TYPE).build())
+                .getBody();
+
+        // create three SoftwareModules
+        final List<MgmtSoftwareModule> softwareModulesRest = softwareModuleResource
+                .createSoftwareModules(
+                        new SoftwareModuleBuilder().name("firmware").version("1.0.0").type(SM_MODULE_TYPE).build())
+                .getBody();
+
+        // Assign SoftwareModule to DistributionSet
+        distributionSetResource.assignSoftwareModules(distributionSetsRest.get(0).getDsId(),
+                new SoftwareModuleAssigmentBuilder().id(softwareModulesRest.get(0).getModuleId()).build());
+
+        // create ten targets
+        targetResource.createTargets(new TargetBuilder().controllerId("00-FF-AA-0").name("00-FF-AA-0")
+                .description("Targets used for rollout example").buildAsList(10));
+
+        // create a Rollout
+        final MgmtRolloutResponseBody rolloutResponseBody = rolloutResource
+                .create(new RolloutBuilder().name("MyRollout").groupSize(2).targetFilterQuery("name==00-FF-AA-0*")
+                        .distributionSetId(distributionSetsRest.get(0).getDsId()).successThreshold("80")
+                        .errorThreshold("50").build())
+                .getBody();
+
+        // start the created Rollout
+        rolloutResource.start(rolloutResponseBody.getRolloutId(), false);
+    }
+
+}
--- a/examples/hawkbit-example-mgmt-simulator/src/main/java/org/eclipse/hawkbit/mgmt/client/scenarios/GettingStartedDefaultScenario.java
+++ b/examples/hawkbit-example-mgmt-simulator/src/main/java/org/eclipse/hawkbit/mgmt/client/scenarios/GettingStartedDefaultScenario.java
@@ -0,0 +1,135 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.mgmt.client.scenarios;
+
+import java.util.List;
+
+import org.eclipse.hawkbit.mgmt.client.resource.MgmtDistributionSetClientResource;
+import org.eclipse.hawkbit.mgmt.client.resource.MgmtDistributionSetTypeClientResource;
+import org.eclipse.hawkbit.mgmt.client.resource.MgmtSoftwareModuleClientResource;
+import org.eclipse.hawkbit.mgmt.client.resource.MgmtSoftwareModuleTypeClientResource;
+import org.eclipse.hawkbit.mgmt.client.resource.builder.DistributionSetBuilder;
+import org.eclipse.hawkbit.mgmt.client.resource.builder.DistributionSetTypeBuilder;
+import org.eclipse.hawkbit.mgmt.client.resource.builder.SoftwareModuleAssigmentBuilder;
+import org.eclipse.hawkbit.mgmt.client.resource.builder.SoftwareModuleBuilder;
+import org.eclipse.hawkbit.mgmt.client.resource.builder.SoftwareModuleTypeBuilder;
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtDistributionSet;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModule;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModuleType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 
+ * Default getting started scenario.
+ *
+ */
+public class GettingStartedDefaultScenario {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(GettingStartedDefaultScenario.class);
+
+    /* known software module type name and key */
+    private static final String SM_MODULE_TYPE = "gettingstarted";
+
+    /* known distribution set type name and key */
+    private static final String DS_MODULE_TYPE = SM_MODULE_TYPE;
+
+    /* known distribution name of this getting started example */
+    private static final String SM_EXAMPLE_NAME = "gettingstarted-example";
+
+    /* known distribution name of this getting started example */
+    private static final String DS_EXAMPLE_NAME = SM_EXAMPLE_NAME;
+
+    @Autowired
+    private MgmtDistributionSetClientResource distributionSetResource;
+
+    @Autowired
+    private MgmtDistributionSetTypeClientResource distributionSetTypeResource;
+
+    @Autowired
+    private MgmtSoftwareModuleClientResource softwareModuleResource;
+
+    @Autowired
+    private MgmtSoftwareModuleTypeClientResource softwareModuleTypeResource;
+
+    /**
+     * Run the default getting started scenario.
+     */
+    public void run() {
+
+        LOGGER.info("Running Getting-Started-Scenario...");
+
+        // create one SoftwareModuleTypes
+        LOGGER.info("Creating software module type {}", SM_MODULE_TYPE);
+        final List<MgmtSoftwareModuleType> createdSoftwareModuleTypes = softwareModuleTypeResource
+                .createSoftwareModuleTypes(new SoftwareModuleTypeBuilder().key(SM_MODULE_TYPE).name(SM_MODULE_TYPE)
+                        .maxAssignments(1).build())
+                .getBody();
+
+        // create one DistributionSetType
+        LOGGER.info("Creating distribution set type {}", DS_MODULE_TYPE);
+        distributionSetTypeResource.createDistributionSetTypes(new DistributionSetTypeBuilder().key(DS_MODULE_TYPE)
+                .name(DS_MODULE_TYPE).mandatorymodules(createdSoftwareModuleTypes.get(0).getModuleId()).build());
+
+        // create three DistributionSet
+        final String dsVersion1 = "1.0.0";
+        final String dsVersion2 = "2.0.0";
+        final String dsVersion3 = "2.1.0";
+
+        LOGGER.info("Creating distribution set {}:{}", DS_EXAMPLE_NAME, dsVersion1);
+        final List<MgmtDistributionSet> distributionSetsRest1 = distributionSetResource.createDistributionSets(
+                new DistributionSetBuilder().name(DS_EXAMPLE_NAME).version(dsVersion1).type(DS_MODULE_TYPE).build())
+                .getBody();
+
+        LOGGER.info("Creating distribution set {}:{}", DS_EXAMPLE_NAME, dsVersion2);
+        final List<MgmtDistributionSet> distributionSetsRest2 = distributionSetResource.createDistributionSets(
+                new DistributionSetBuilder().name(DS_EXAMPLE_NAME).version(dsVersion2).type(DS_MODULE_TYPE).build())
+                .getBody();
+
+        LOGGER.info("Creating distribution set {}:{}", DS_EXAMPLE_NAME, dsVersion3);
+        final List<MgmtDistributionSet> distributionSetsRest3 = distributionSetResource.createDistributionSets(
+                new DistributionSetBuilder().name(DS_EXAMPLE_NAME).version(dsVersion3).type(DS_MODULE_TYPE).build())
+                .getBody();
+
+        // create three SoftwareModules
+        final String swVersion1 = "1";
+        final String swVersion2 = "2";
+        final String swVersion3 = "3";
+
+        LOGGER.info("Creating distribution set {}:{}", SM_EXAMPLE_NAME, swVersion1);
+        final List<MgmtSoftwareModule> softwareModulesRest1 = softwareModuleResource.createSoftwareModules(
+                new SoftwareModuleBuilder().name(SM_EXAMPLE_NAME).version(swVersion1).type(SM_MODULE_TYPE).build())
+                .getBody();
+        LOGGER.info("Creating distribution set {}:{}", SM_EXAMPLE_NAME, swVersion2);
+        final List<MgmtSoftwareModule> softwareModulesRest2 = softwareModuleResource.createSoftwareModules(
+                new SoftwareModuleBuilder().name(SM_EXAMPLE_NAME).version(swVersion2).type(SM_MODULE_TYPE).build())
+                .getBody();
+        LOGGER.info("Creating distribution set {}:{}", SM_EXAMPLE_NAME, swVersion3);
+        final List<MgmtSoftwareModule> softwareModulesRest3 = softwareModuleResource.createSoftwareModules(
+                new SoftwareModuleBuilder().name(SM_EXAMPLE_NAME).version(swVersion3).type(SM_MODULE_TYPE).build())
+                .getBody();
+
+        // Assign SoftwareModules to DistributionSet
+        LOGGER.info("Assign software module {}:{} to distribution set {}:{}", SM_EXAMPLE_NAME, swVersion1,
+                DS_EXAMPLE_NAME, dsVersion1);
+        distributionSetResource.assignSoftwareModules(distributionSetsRest1.get(0).getDsId(),
+                new SoftwareModuleAssigmentBuilder().id(softwareModulesRest1.get(0).getModuleId()).build());
+
+        LOGGER.info("Assign software module {}:{} to distribution set {}:{}", SM_EXAMPLE_NAME, swVersion2,
+                DS_EXAMPLE_NAME, dsVersion2);
+        distributionSetResource.assignSoftwareModules(distributionSetsRest2.get(0).getDsId(),
+                new SoftwareModuleAssigmentBuilder().id(softwareModulesRest2.get(0).getModuleId()).build());
+
+        LOGGER.info("Assign software module {}:{} to distribution set {}:{}", SM_EXAMPLE_NAME, swVersion3,
+                DS_EXAMPLE_NAME, dsVersion3);
+        distributionSetResource.assignSoftwareModules(distributionSetsRest3.get(0).getDsId(),
+                new SoftwareModuleAssigmentBuilder().id(softwareModulesRest3.get(0).getModuleId()).build());
+    }
+}
--- a/examples/hawkbit-example-mgmt-simulator/src/main/resources/application.properties
+++ b/examples/hawkbit-example-mgmt-simulator/src/main/resources/application.properties
@@ -0,0 +1,14 @@
+#
+# Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+
+hawkbit.url=localhost:8080
+hawkbit.username=admin
+hawkbit.password=admin
+
+spring.main.show-banner=false
--- a/examples/hawkbit-example-mgmt-simulator/src/main/resources/logback.xml
+++ b/examples/hawkbit-example-mgmt-simulator/src/main/resources/logback.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+-->
+<configuration>
+   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+      <!-- Log message format -->
+      <encoder>
+         <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+         </pattern>
+      </encoder>
+   </appender>
+
+   <logger name="org.eclipse.hawkbit" level="info" />
+
+   <root level="error">
+      <appender-ref ref="STDOUT" />
+   </root>
+
+</configuration>