From 4a0ea6cefb05af77565ffbdb6fa5b29e695860ec Mon Sep 17 00:00:00 2001
From: Escalante Martinez <Marisa.Escalante@tecnalia.com>
Date: Thu, 29 Nov 2018 15:17:30 +0100
Subject: [PATCH] Added AppController M24
---
AppController/.gitignore | 253 ++---
AppController/LICENSE.txt | 947 ++++++++++++------
AppController/README.md | 278 ++---
AppController/pom.xml | 223 +++--
.../appManager/AppDescriptionFactory.java | 226 +++--
.../appManager/AppDescriptionHelper.java | 168 ++--
.../eu/DECIDEh2020/appManager/AppManager.java | 19 +
.../appManager/HistoryFactory.java | 20 +-
.../appManager/HistoryManager.java | 26 +-
.../exceptions/AppManagerException.java | 13 +
.../exceptions/DECIDEValidationException.java | 13 +
.../appManager/models/AppDescription.java | 35 +-
.../appManager/models/AvailabilityNfr.java | 33 +-
.../appManager/models/Container.java | 80 +-
.../appManager/models/CostNfr.java | 34 +-
.../appManager/models/DetachableResource.java | 25 +-
.../appManager/models/Endpoint.java | 31 +-
.../appManager/models/Expression.java | 24 +-
.../models/HistoricalDeployment.java | 13 +
.../appManager/models/HistoryEntry.java | 40 +-
.../models/InfrastructureRequirements.java | 13 +
.../appManager/models/LocationNfr.java | 43 +-
.../DECIDEh2020/appManager/models/Mcsla.java | 27 +-
.../DECIDEh2020/appManager/models/Metric.java | 30 +-
.../appManager/models/Microservice.java | 43 +-
.../appManager/models/Monitoring.java | 19 +-
.../eu/DECIDEh2020/appManager/models/Nfr.java | 35 +-
.../appManager/models/Parameter.java | 26 +-
.../appManager/models/Pattern.java | 43 +
.../appManager/models/PerformanceNfr.java | 34 +-
.../appManager/models/PortMapping.java | 13 +
.../DECIDEh2020/appManager/models/Remedy.java | 30 +-
.../appManager/models/ScalabilityNfr.java | 43 +-
.../appManager/models/SchemaElement.java | 19 +-
.../appManager/models/ServiceObjective.java | 52 +-
.../eu/DECIDEh2020/appManager/models/Sla.java | 34 +-
.../models/ViolationTriggerRule.java | 40 +-
.../appManager/models/VirtualMachine.java | 146 ++-
.../appManager/models/VolumeMapping.java | 13 +
.../appManager/persistence/GitHandler.java | 104 +-
.../application_description.schema.json | 154 +--
.../resources/optimus_history.schema.json | 38 +-
.../appManager/AppDescriptionFactoryTest.java | 30 +-
.../appManager/AppDescriptionHelperTest.java | 13 +
.../appManager/AppManagerTest.java | 31 +
.../appManager/HistoryFactoryTest.java | 13 +
.../appManager/HistoryManagerTest.java | 21 +
AppController/src/test/resources/DECIDE.json | 41 +-
48 files changed, 2368 insertions(+), 1281 deletions(-)
diff --git a/AppController/.gitignore b/AppController/.gitignore
index 06149626..65be12da 100644
--- a/AppController/.gitignore
+++ b/AppController/.gitignore
@@ -1,124 +1,129 @@
-/classes/
-*.class
-*.lst
-
-# Created by .ignore support plugin (hsz.mobi)
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-*.iml
-
-# User-specific stuff:
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/dictionaries
-
-# Sensitive or high-churn files:
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.xml
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-
-# Gradle:
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# CMake
-cmake-build-debug/
-
-# Mongo Explorer plugin:
-.idea/**/mongoSettings.xml
-
-## File-based project format:
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-### Maven template
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-pom.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-
-# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
-!/.mvn/wrapper/maven-wrapper.jar
-### Eclipse template
-
-.project
-.classpath
-
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
-# Java annotation processor (APT)
-.factorypath
-
-# PDT-specific (PHP Development Tools)
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# Tern plugin
-.tern-project
-
-# TeXlipse plugin
-.texlipse
-
-# STS (Spring Tool Suite)
-.springBeans
-
-# Code Recommenders
-.recommenders/
-
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
+/classes/
+*.class
+*.lst
+
+# Created by .ignore support plugin (hsz.mobi)
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+*.iml
+
+.idea/
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+### Maven template
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+pom.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
+!/.mvn/wrapper/maven-wrapper.jar
+### Eclipse template
+
+.project
+.classpath
+
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+#Windows specific
+*~
diff --git a/AppController/LICENSE.txt b/AppController/LICENSE.txt
index 90ad6b2b..1a5effe4 100644
--- a/AppController/LICENSE.txt
+++ b/AppController/LICENSE.txt
@@ -1,281 +1,666 @@
-Copyright (C) 2017 Fraunhofer FOKUS.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Eclipse Public License version 2.0.
-
-Eclipse Public License - v 2.0
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial content
-Distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from
-and are Distributed by that particular Contributor. A Contribution
-"originates" from a Contributor if it was added to the Program by
-such Contributor itself or anyone acting on such Contributor's behalf.
-Contributions do not include changes or additions to the Program that
-are not Modified Works.
-
-"Contributor" means any person or entity that Distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which
-are necessarily infringed by the use or sale of its Contribution alone
-or when combined with the Program.
-
-"Program" means the Contributions Distributed in accordance with this
-Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement
-or any Secondary License (as applicable), including Contributors.
-
-"Derivative Works" shall mean any work, whether in Source Code or other
-form, that is based on (or derived from) the Program and for which the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship.
-
-"Modified Works" shall mean any work in Source Code or other form that
-results from an addition to, deletion from, or modification of the
-contents of the Program, including, for purposes of clarity any new file
-in Source Code form that contains any contents of the Program. Modified
-Works shall not include works that contain only declarations,
-interfaces, types, classes, structures, or files of the Program solely
-in each case in order to link to, bind by name, or subclass the Program
-or Modified Works thereof.
-
-"Distribute" means the acts of a) distributing or b) making available
-in any manner that enables the transfer of a copy.
-
-"Source Code" means the form of a Program preferred for making
-modifications, including but not limited to software source code,
-documentation source, and configuration files.
-
-"Secondary License" means either the GNU General Public License,
-Version 2.0, or any later versions of that license, including any
-exceptions or additional permissions as identified by the initial
-Contributor.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare Derivative Works of, publicly display,
-publicly perform, Distribute and sublicense the Contribution of such
-Contributor, if any, and such Derivative Works.
-
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent
-license under Licensed Patents to make, use, sell, offer to sell,
-import and otherwise transfer the Contribution of such Contributor,
-if any, in Source Code or other form. This patent license shall
-apply to the combination of the Contribution and the Program if, at
-the time the Contribution is added by the Contributor, such addition
-of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity.
-Each Contributor disclaims any liability to Recipient for claims
-brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the
-rights and licenses granted hereunder, each Recipient hereby
-assumes sole responsibility to secure any other intellectual
-property rights needed, if any. For example, if a third party
-patent license is required to allow Recipient to Distribute the
-Program, it is Recipient's responsibility to acquire that license
-before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has
-sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.
-
-e) Notwithstanding the terms of any Secondary License, no
-Contributor makes additional grants to any Recipient (other than
-those set forth in this Agreement) as a result of such Recipient's
-receipt of the Program under the terms of a Secondary License
-(if permitted under the terms of Section 3).
-
-3. REQUIREMENTS
-
-3.1 If a Contributor Distributes the Program in any form, then:
-
-a) the Program must also be made available as Source Code, in
-accordance with section 3.2, and the Contributor must accompany
-the Program with a statement that the Source Code for the Program
-is available under this Agreement, and informs Recipients how to
-obtain it in a reasonable manner on or through a medium customarily
-used for software exchange; and
-
-b) the Contributor may Distribute the Program under a license
-different than this Agreement, provided that such license:
-i) effectively disclaims on behalf of all other Contributors all
-warranties and conditions, express and implied, including
-warranties or conditions of title and non-infringement, and
-implied warranties or conditions of merchantability and fitness
-for a particular purpose;
-
-ii) effectively excludes on behalf of all other Contributors all
-liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-iii) does not attempt to limit or alter the recipients' rights
-in the Source Code under section 3.2; and
-
-iv) requires any subsequent distribution of the Program by any
-party to be under a license that satisfies the requirements
-of this section 3.
-
-3.2 When the Program is Distributed as Source Code:
-
-a) it must be made available under this Agreement, or if the
-Program (i) is combined with other material in a separate file or
-files made available under a Secondary License, and (ii) the initial
-Contributor attached to the Source Code the notice described in
-Exhibit A of this Agreement, then the Program may be made available
-under the terms of such Secondary Licenses, and
-
-b) a copy of this Agreement must be included with each copy of
-the Program.
-
-3.3 Contributors may not remove or alter any copyright, patent,
-trademark, attribution notices, disclaimers of warranty, or limitations
-of liability ("notices") contained within the Program from any copy of
-the Program which they Distribute, provided that Contributors may add
-their own appropriate notices.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities
-with respect to end users, business partners and the like. While this
-license is intended to facilitate the commercial use of the Program,
-the Contributor who includes the Program in a commercial product
-offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes
-the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and indemnify every
-other Contributor ("Indemnified Contributor") against any losses,
-damages and costs (collectively "Losses") arising from claims, lawsuits
-and other legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the Program
-in a commercial product offering. The obligations in this section do not
-apply to any claims or Losses relating to any actual or alleged
-intellectual property infringement. In order to qualify, an Indemnified
-Contributor must: a) promptly notify the Commercial Contributor in
-writing of such claim, and b) allow the Commercial Contributor to control,
-and cooperate with the Commercial Contributor in, the defense and any
-related settlement negotiations. The Indemnified Contributor may
-participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those performance
-claims and warranties, and if a court requires any other Contributor to
-pay any damages as a result, the Commercial Contributor must pay
-those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE. Each Recipient is solely responsible for determining the
-appropriateness of using and distributing the Program and assumes all
-risks associated with its exercise of rights under this Agreement,
-including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs
-or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further
-action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other software
-or hardware) infringes such Recipient's patent(s), then such Recipient's
-rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of
-time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use
-and distribution of the Program as soon as reasonably practicable.
-However, Recipient's obligations under this Agreement and any licenses
-granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and
-may only be modified in the following manner. The Agreement Steward
-reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement
-Steward has the right to modify this Agreement. The Eclipse Foundation
-is the initial Agreement Steward. The Eclipse Foundation may assign the
-responsibility to serve as the Agreement Steward to a suitable separate
-entity. Each new version of the Agreement will be given a distinguishing
-version number. The Program (including Contributions) may always be
-Distributed subject to the version of the Agreement under which it was
-received. In addition, after a new version of the Agreement is published,
-Contributor may elect to Distribute the Program (including its
-Contributions) under the new version.
-
-Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-receives no rights or licenses to the intellectual property of any
-Contributor under this Agreement, whether expressly, by implication,
-estoppel or otherwise. All rights in the Program not expressly granted
-under this Agreement are reserved. Nothing in this Agreement is intended
-to be enforceable by any entity that is not a Contributor or Recipient.
-No third-party beneficiary rights are created under this Agreement.
-
-Exhibit A - Form of Secondary Licenses Notice
-
-"This Source Code may also be made available under the following
-Secondary Licenses when the conditions for such availability set forth
-in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-version(s), and exceptions or additional permissions here}."
-
-Simply including a copy of this Agreement, including this Exhibit A
-is not sufficient to license the Source Code under Secondary Licenses.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to
-look for such a notice.
-
-You may add additional accurate notices of copyright ownership.
\ No newline at end of file
+Copyright (C) 2018 Fraunhofer FOKUS.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE Version 3.
+
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU Affero General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
diff --git a/AppController/README.md b/AppController/README.md
index 0280169b..e81a7272 100644
--- a/AppController/README.md
+++ b/AppController/README.md
@@ -1,128 +1,150 @@
-# DECIDE Application Controller
-
-The Application Controller Library provides a consistent way for handling the AppDescription and History json files to every project that has to operate on these files.
-
-## Table of Contents
-1. [Features](#features)
-1. [Installation](#installation)
-1. [Getting started](#getting-started)
-1. [The Model](#the-model)
-1. [The Interface](#the-interface)
-1. [License](#license)
-
-## Features
-
-- :sunglasses: A simple and intuitive interface
-- :hammer_and_wrench: Internal handling of state in git repository and filesystem
-
-
-## Building from Source
-
-The project is available via Git repository. If you have access, do the following steps:
-
-```shell
-$> git clone https://gitlab.fokus.fraunhofer.de/DECIDE/app-controller.git
-$> cd app-controller
-```
-
-The project uses Maven as build tool. After build you will find the jar and a fat jar in the target directory. To build use the follwoing command:
-
-```shell
-$> mvn clean package
-```
-
-Use `-DskipTests` if the test repository is not accessible for you. If you would like to do the tests, edit the test class `AppManagerTest` and provide the necessary remote repository values.
-
-## Installation
-
-For non-Maven based projects you can take the build jar file located in the target directory after executing the build command and put it in the classpath of your application. There is also a fat jar provided containing all dependecies if required.
-
-For Maven based projects you need to install it in a Maven repository which your application can access. E.g. to put it in your local maven repository, you can simply call
-`$> mvn install`
-
-Finally, your application pom.xml requires the following dependency:
-
-```xml
-<dependency>
- <groupId>eu.DECIDEh2020</groupId>
- <artifactId>app-controller</artifactId>
- <version>0.0.2</version>
-</dependency>
-```
-
-## Getting started
-A small example on getting the `AppDescription` and saving it using the `AppManager`:
-
-```java
-AppManager appManager = AppManager.open(String gitRef, String username, String password, Path localPath);
-
-//get the Appdescription
-AppDescription appDescription = appManager.getAppDescription();
-
-//do something with the AppDescription
-//then save
-
-appManager.writeAndSync(appDescription, "Added new Microservices");
-
-//close the AppManager
-appManager.close();
-```
-
-Since the `AppManager` also implements the `Closeable` interface you can also use the `try-with-resources` statement to work on the `AppDescription`.
-
-```java
-Path path = FileSystems.getDefault().getPath("path/to/git/dir");
-
-try (AppManager appManager = AppManager.open("https://git.ref/", "username", "password", path)) {
- AppDescription appDescription = appManager.getAppDescription();
- //work on the AppDescription & save it with AppManager
- appManager.writeAndSync(appDescription, "Added NFRs");
-} catch (IOException e) {
- e.printStackTrace();
-}
-```
-
-For further examples please take a look at the test cases.
-
-## The Model
-
-### `AppDescription`
-The library implements the application description and all its properties as POJOs with corresponding getters and setters. See package `eu.DECIDEh2020.appManager.models` for an overview. During serialization any empty or null properties will be ommitted.
-
-For more flexibility during the development of DECIDE some model classes allow the setting and getting of additional properties that are not part of the schema. These classes are so far:
- * `AppDescription`
- * `Nfr`
- * `Pattern`
- * `Container`
- * `VirtualMachine`
-
-They have the special setter `setAdditionalProperties()` and getter `getAdditionalProperties()`, which sets and gets any JsonNode objects as values.
-
-### `List<HistoryEntry>`
-
-## The Interface
-In general there are three main classes:
- * `AppDescriptionFactory`
- * `AppDescriptionHelper`
- * `AppManager`
- * `HistoryFactory`
- * `HistoryManager`
-
-### `AppDescriptionFactory`
-This class provides static methods for creating, loading, saving and validating app description instances.
-
-### `AppDescriptionHelper`
-This class provides convenient methods to access internal information of the app description by processing any conventions made by the project. E.g. retreives groups and lists defined by tags.
-
-### `AppManager`
-This class offers encapsulation to any persistency. Current implementation covers a git repository.
-
-### `HistoryFactory`
-This class provides static methods for creating, loading, saving and validating history instances.
-
-### `HistoryManager`
-This class encapsulates the history model inside the app context. Therefore it can only be instantiated from an app manager.
-
-## License
-
-[Eclipse Public License version 2.0.](LICENSE.txt)
\ No newline at end of file
+# DECIDE Application Controller Library
+
+The Application Controller Library provides a consistent way for handling the AppDescription and History json files to every project that has to operate on these files.
+
+## Table of Contents
+1. [Features](#features)
+1. [Installation](#installation)
+1. [Getting started](#getting-started)
+1. [Validation Exception Handling](#validation-exception-handling)
+1. [The Model](#the-model)
+1. [The Interface](#the-interface)
+1. [License](#license)
+
+## Features
+
+- :sunglasses: A simple and intuitive interface
+- :hammer_and_wrench: Internal handling of state in git repository and filesystem
+
+
+## Building from Source
+
+The project is available via Git repository. If you have access, do the following steps:
+
+```bash
+$> git clone https://gitlab.fokus.fraunhofer.de/DECIDE/app-controller.git
+$> cd app-controller
+```
+
+The project uses Maven as build tool. After build you will find the jar and a fat jar in the target directory. To build use the follwoing command:
+
+```bash
+$> mvn clean package
+```
+
+Use `-DskipTests` if the test repository is not accessible for you. If you would like to do the tests, edit the test class `AppManagerTest` and provide the necessary remote repository values.
+
+## Installation
+
+For non-Maven based projects you can take the build jar file located in the target directory after executing the build command and put it in the classpath of your application. There is also a fat jar provided containing all dependecies if required.
+
+For Maven based projects you need to install it in a Maven repository which your application can access. E.g. to put it in your local maven repository, you can simply call
+`$> mvn install`
+
+Finally, your application pom.xml requires the following dependency:
+
+```xml
+<dependency>
+ <groupId>eu.DECIDEh2020</groupId>
+ <artifactId>app-controller</artifactId>
+ <version>0.0.2</version>
+</dependency>
+```
+
+## Getting started
+A small example on getting the `AppDescription` and saving it using the `AppManager`:
+
+```java
+AppManager appManager = AppManager.open(String gitRef, String username, String password, Path localPath);
+
+// get the Appdescription
+AppDescription appDescription = appManager.getAppDescription();
+
+// do something with the AppDescription
+
+// then save
+appManager.writeAndSync(appDescription, "Added new Microservices");
+
+// close the AppManager
+appManager.close();
+```
+
+Since the `AppManager` also implements the `Closeable` interface you can also use the `try-with-resources` statement to work on the `AppDescription`.
+
+```java
+Path path = FileSystems.getDefault().getPath("path/to/git/dir");
+
+try (AppManager appManager = AppManager.open("https://git.ref/", "username", "password", path)) {
+ AppDescription appDescription = appManager.getAppDescription();
+ //work on the AppDescription & save it with AppManager
+ appManager.writeAndSync(appDescription, "Added NFRs");
+} catch (AppManagerException | IOException e) {
+ e.printStackTrace();
+}
+```
+
+For further examples please take a look at the test cases.
+## Validation Exception Handling
+A `DECIDEValidationException` is usually a wrapper for the underlying validation library validation errors. The AppController utilizes the JSON Schema Validator from everit-org. You can easily access the original `ValidationException` if you need more details beyond the main message.
+```java
+try {
+ AppDescription appDescription = appManager.getAppDescription();
+} catch (DECIDEValidationException e) {
+ ValidationException original = (ValidationException)e.getCause();
+
+ // get a list of all sub messages
+ List<String> messages = original.getAllMessages();
+
+ // get all sub exceptions. Each one is again a ValidationException
+ List<ValidationException> original.getCausingExceptions();
+
+ // getting a fancy pretty printed json structure containing all sub errors
+ String json = original.getJSON().toString(4);
+
+} catch (IOEXception e) {
+}
+```
+Please note that `DECIDEValidationException` is also a subclass of `AppManagerException`.
+
+## The Model
+
+### `AppDescription`
+The library implements the application description and all its properties as POJOs with corresponding getters and setters. See package `eu.DECIDEh2020.appManager.models` for an overview. During serialization any empty or null properties will be ommitted.
+
+For more flexibility during the development of DECIDE some model classes allow the setting and getting of additional properties that are not part of the schema. These classes are so far:
+ * `AppDescription`
+ * `Nfr`
+ * `Pattern`
+ * `Container`
+ * `VirtualMachine`
+
+They have the special setter `setAdditionalProperties()` and getter `getAdditionalProperties()`, which sets and gets any JsonNode objects as values.
+
+### `List<HistoryEntry>`
+
+## The Interface
+In general there are three main classes:
+ * `AppDescriptionFactory`
+ * `AppDescriptionHelper`
+ * `AppManager`
+ * `HistoryFactory`
+ * `HistoryManager`
+
+### `AppDescriptionFactory`
+This class provides static methods for creating, loading, saving and validating app description instances.
+
+### `AppDescriptionHelper`
+This class provides convenient methods to access internal information of the app description by processing any conventions made by the project. E.g. retreives groups and lists defined by tags.
+
+### `AppManager`
+This class offers encapsulation to any persistency. Current implementation covers a git repository.
+
+### `HistoryFactory`
+This class provides static methods for creating, loading, saving and validating history instances.
+
+### `HistoryManager`
+This class encapsulates the history model inside the app context. Therefore it can only be instantiated from an app manager.
+
+## License
+
+[GNU Affero General Public License Version 3](LICENSE.txt)
\ No newline at end of file
diff --git a/AppController/pom.xml b/AppController/pom.xml
index 5f1bf7a6..62c7315a 100644
--- a/AppController/pom.xml
+++ b/AppController/pom.xml
@@ -1,98 +1,125 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>eu.DECIDEh2020</groupId>
- <artifactId>app-controller</artifactId>
- <version>0.0.12</version>
- <repositories>
- <repository>
- <id>jgit-repository</id>
- <url>https://repo.eclipse.org/content/groups/releases/</url>
- </repository>
- <repository>
- <id>jitpack.io</id>
- <url>https://jitpack.io</url>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jgit</groupId>
- <artifactId>org.eclipse.jgit</artifactId>
- <version>4.11.0.201803080745-r</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.9.5</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>2.9.5</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.9.5</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.2.3</version>
- </dependency>
- <dependency>
- <groupId>com.github.everit-org.json-schema</groupId>
- <artifactId>org.everit.json.schema</artifactId>
- <version>1.9.1</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.14.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.1.1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- <outputFile>${project.build.directory}/${project.artifactId}-${project.version}-fat.jar</outputFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>eu.DECIDEh2020</groupId>
+ <artifactId>app-controller</artifactId>
+ <version>0.0.16-SNAPSHOT</version>
+
+ <distributionManagement>
+ <repository>
+ <id>paca</id>
+ <name>Paca Releases Repo</name>
+ <url>https://paca.fokus.fraunhofer.de/repository/maven-releases/</url>
+ </repository>
+ <snapshotRepository>
+ <id>paca</id>
+ <url>https://paca.fokus.fraunhofer.de/repository/maven-snapshots/</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <scm>
+ <connection>scm:git:https://${GITLAB_USER_LDAP}:${GITLAB_USER_PASSWORD}@gitlab.fokus.fraunhofer.de/${CI_PROJECT_PATH}</connection>
+ <url>https://${GITLAB_USER_LDAP}:${GITLAB_USER_PASSWORD}@gitlab.fokus.fraunhofer.de/${CI_PROJECT_PATH}</url>
+ <developerConnection>scm:git:https://${GITLAB_USER_LDAP}:${GITLAB_USER_PASSWORD}@gitlab.fokus.fraunhofer.de/${CI_PROJECT_PATH}</developerConnection>
+ <tag>HEAD</tag>
+ </scm>
+
+ <repositories>
+ <repository>
+ <id>jgit-repository</id>
+ <url>https://repo.eclipse.org/content/groups/releases/</url>
+ </repository>
+ <repository>
+ <id>jitpack.io</id>
+ <url>https://jitpack.io</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit</artifactId>
+ <version>5.1.1.201809181055-r</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.9.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.9.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.9.6</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.everit-org.json-schema</groupId>
+ <artifactId>org.everit.json.schema</artifactId>
+ <version>1.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.14.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
+ <configuration>
+ <tagNameFormat>v@{project.version}</tagNameFormat>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <minimizeJar>true</minimizeJar>
+ <shadedArtifactAttached>true</shadedArtifactAttached>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/AppDescriptionFactory.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/AppDescriptionFactory.java
index 34e4d5d1..d98c7bae 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/AppDescriptionFactory.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/AppDescriptionFactory.java
@@ -1,107 +1,119 @@
-package eu.DECIDEh2020.appManager;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.UUID;
-
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.DECIDEh2020.appManager.exceptions.DECIDEValidationException;
-import eu.DECIDEh2020.appManager.models.AppDescription;
-import eu.DECIDEh2020.appManager.models.Microservice;
-import org.everit.json.schema.Schema;
-import org.everit.json.schema.ValidationException;
-import org.everit.json.schema.loader.SchemaLoader;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AppDescriptionFactory {
-
- private static Logger log = LoggerFactory.getLogger(AppDescriptionFactory.class);
-
- private static Schema schema;
-
- static {
- try (InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("application_description.schema.json")) {
- JSONObject rawSchema = new JSONObject(new JSONTokener(inputStream));
- schema = SchemaLoader.load(rawSchema);
- } catch (IOException e) {
- log.error("reading schema", e);
- }
-
- /*
- JsonSchemaFactory factory = JsonSchemaFactory.byDefault();
- InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("application_description.schema.json");
- try {
- schema = factory.getJsonSchema(new ObjectMapper().readTree(is));
- } catch (ProcessingException | IOException e) {
- log.error("reading json schema", e);
- }
- */
- }
-
- public static AppDescription createAppDescription(String name) {
- AppDescription appDescription = new AppDescription();
- appDescription.setId(UUID.randomUUID().toString());
- appDescription.setName(name);
-
- appDescription.setVersion("0.2.2-alpha");
- appDescription.setHighTechnologicalRisk(false);
-
- appDescription.setMicroservices(Collections.singletonList(createMicroservice("Default")));
-
- return appDescription;
- }
-
- public static Microservice createMicroservice(String name) {
- Microservice microservice = new Microservice();
- microservice.setId(UUID.randomUUID().toString());
- microservice.setName(name);
-
- microservice.setEndpoints(Collections.singletonList("http://mircroservice1.com/service"));
-
- return microservice;
- }
-
- public static AppDescription loadAppDescription(Path path) {
- try {
- return new ObjectMapper().readValue(path.toFile(), AppDescription.class);
- } catch (IOException e) {
- log.error("reading app description file", e);
- return null;
- }
- }
-
- public static AppDescription fromJson(String jsonString) throws JsonParseException, JsonMappingException, IOException {
- return new ObjectMapper().readValue(jsonString, AppDescription.class);
- }
-
- public static void validateAppDescription(AppDescription appDescription) throws DECIDEValidationException {
- try {
- schema.validate(new JSONObject(new ObjectMapper().writeValueAsString(appDescription)));
- } catch (JsonProcessingException e) {
- log.error("json to string", e);
- throw new DECIDEValidationException(e);
- } catch (ValidationException e) {
- log.error("validating json", e);
- throw new DECIDEValidationException(e);
- }
- }
-
- public static void validateAppDescription(JsonNode appDescription) throws DECIDEValidationException {
- try {
- validateAppDescription(new ObjectMapper().treeToValue(appDescription, AppDescription.class));
- } catch (JsonProcessingException e) {
- log.error("json to value", e);
- throw new DECIDEValidationException(e);
- }
- }
-
-}
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
+package eu.DECIDEh2020.appManager;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.util.UUID;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import eu.DECIDEh2020.appManager.exceptions.DECIDEValidationException;
+import eu.DECIDEh2020.appManager.models.AppDescription;
+import eu.DECIDEh2020.appManager.models.Microservice;
+import org.everit.json.schema.Schema;
+import org.everit.json.schema.ValidationException;
+import org.everit.json.schema.loader.SchemaLoader;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AppDescriptionFactory {
+
+ private static Logger log = LoggerFactory.getLogger(AppDescriptionFactory.class);
+
+ private static Schema schema;
+
+ static {
+ try (InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("application_description.schema.json")) {
+ JSONObject rawSchema = new JSONObject(new JSONTokener(inputStream));
+ schema = SchemaLoader.load(rawSchema);
+ } catch (IOException e) {
+ log.error("reading schema", e);
+ }
+
+ /*
+ JsonSchemaFactory factory = JsonSchemaFactory.byDefault();
+ InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("application_description.schema.json");
+ try {
+ schema = factory.getJsonSchema(new ObjectMapper().readTree(is));
+ } catch (ProcessingException | IOException e) {
+ log.error("reading json schema", e);
+ }
+ */
+ }
+
+ public static AppDescription createAppDescription(String name) {
+ AppDescription appDescription = new AppDescription();
+ appDescription.setId(UUID.randomUUID().toString());
+ appDescription.setName(name);
+
+ appDescription.setVersion("0.2.2-alpha");
+ appDescription.setHighTechnologicalRisk(false);
+
+ appDescription.getMicroservices().add(createMicroservice("Default"));
+
+ return appDescription;
+ }
+
+ public static Microservice createMicroservice(String name) {
+ Microservice microservice = new Microservice();
+ microservice.setId(UUID.randomUUID().toString());
+ microservice.setName(name);
+
+ microservice.getEndpoints().add("http://mircroservice1.com/service");
+
+ return microservice;
+ }
+
+ public static AppDescription loadAppDescription(Path path) {
+ try {
+ return new ObjectMapper().readValue(path.toFile(), AppDescription.class);
+ } catch (IOException e) {
+ log.error("reading app description file", e);
+ return null;
+ }
+ }
+
+ public static AppDescription fromJson(String jsonString) throws JsonParseException, JsonMappingException, IOException {
+ return new ObjectMapper().readValue(jsonString, AppDescription.class);
+ }
+
+ public static void validateAppDescription(AppDescription appDescription) throws DECIDEValidationException {
+ try {
+ schema.validate(new JSONObject(new ObjectMapper().writeValueAsString(appDescription)));
+ } catch (JsonProcessingException e) {
+ log.error("json to string", e);
+ throw new DECIDEValidationException(e);
+ } catch (ValidationException e) {
+ log.error("validating json", e);
+ throw new DECIDEValidationException(e);
+ }
+ }
+
+ public static void validateAppDescription(JsonNode appDescription) throws DECIDEValidationException {
+ try {
+ validateAppDescription(new ObjectMapper().treeToValue(appDescription, AppDescription.class));
+ } catch (JsonProcessingException e) {
+ log.error("json to value", e);
+ throw new DECIDEValidationException(e);
+ }
+ }
+
+}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/AppDescriptionHelper.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/AppDescriptionHelper.java
index 8cc0720e..a4d58763 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/AppDescriptionHelper.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/AppDescriptionHelper.java
@@ -1,75 +1,93 @@
-package eu.DECIDEh2020.appManager;
-
-import eu.DECIDEh2020.appManager.models.AppDescription;
-import eu.DECIDEh2020.appManager.models.Microservice;
-import eu.DECIDEh2020.appManager.models.Nfr;
-import eu.DECIDEh2020.appManager.models.Pattern;
-
-import java.util.HashSet;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class AppDescriptionHelper {
-
- private AppDescription appDescription;
-
- public static AppDescriptionHelper create(AppDescription appDescription) {
- return new AppDescriptionHelper(appDescription);
- }
-
- private AppDescriptionHelper(AppDescription appDescription) {
- this.appDescription = appDescription;
- }
-
- public Set<String> getTags() {
-
- Set<String> tags;
- if (appDescription.getMicroservices() != null) {
- tags = appDescription.getMicroservices().stream().flatMap(m -> m.getTags().stream())
- .collect(Collectors.toSet());
- } else {
- tags = new HashSet<String>();
- }
- if (appDescription.getNfrs() != null) {
- Set<String> ntags = appDescription.getNfrs().stream().flatMap(m -> m.getTags().stream())
- .collect(Collectors.toSet());
- tags.addAll(ntags);
- }
- return tags;
- }
-
- public List<String> getMicroserviceGroups() {
- Map<String, Long> tags = appDescription.getMicroservices().stream().flatMap(m -> m.getTags().stream())
- .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
- return tags.keySet().stream().filter(t -> tags.get(t) >= 2).collect(Collectors.toList());
- }
-
- public boolean isMicroserviceGroup(String tag) {
- return appDescription.getMicroservices().stream().filter(m -> m.getTags().contains(tag)).count() >= 2;
- }
-
- public List<Microservice> getGroupMicroservices(String tag) {
- return appDescription.getMicroservices().stream().filter(m -> m.getTags().contains(tag)).collect(Collectors.toList());
- }
-
- public List<Nfr> getGroupNfrs(String tag) {
- return appDescription.getNfrs().stream().filter(n -> n.getTags().contains(tag)).collect(Collectors.toList());
- }
-
- public List<Pattern> getGroupPatterns(String tag) {
- return appDescription.getRecommendedPatterns().stream().filter(p -> p.getTags().contains(tag)).collect(Collectors.toList());
- }
-
- public String getJson() throws JsonProcessingException {
- return new ObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(appDescription);
-
- }
-
-}
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
+package eu.DECIDEh2020.appManager;
+
+import eu.DECIDEh2020.appManager.models.AppDescription;
+import eu.DECIDEh2020.appManager.models.Microservice;
+import eu.DECIDEh2020.appManager.models.Nfr;
+import eu.DECIDEh2020.appManager.models.Pattern;
+
+import java.util.HashSet;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class AppDescriptionHelper {
+
+ private AppDescription appDescription;
+
+ public static AppDescriptionHelper create(AppDescription appDescription) {
+ return new AppDescriptionHelper(appDescription);
+ }
+
+ private AppDescriptionHelper(AppDescription appDescription) {
+ this.appDescription = appDescription;
+ }
+
+ public Set<String> getTags() {
+
+ Set<String> tags;
+ if (appDescription.getMicroservices() != null) {
+ tags = appDescription.getMicroservices().stream().flatMap(m -> m.getTags().stream())
+ .collect(Collectors.toSet());
+ } else {
+ tags = new HashSet<String>();
+ }
+ if (appDescription.getNfrs() != null) {
+ Set<String> ntags = appDescription.getNfrs().stream().flatMap(m -> m.getTags().stream())
+ .collect(Collectors.toSet());
+ tags.addAll(ntags);
+ }
+ return tags;
+ }
+
+ public List<String> getMicroserviceGroups() {
+ Map<String, Long> tags = appDescription.getMicroservices().stream().flatMap(m -> m.getTags().stream())
+ .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
+ return tags.keySet().stream().filter(t -> tags.get(t) >= 2).collect(Collectors.toList());
+ }
+
+ public boolean isMicroserviceGroup(String tag) {
+ return appDescription.getMicroservices().stream().filter(m -> m.getTags().contains(tag)).count() >= 2;
+ }
+
+ public List<Microservice> getGroupMicroservices(String tag) {
+ return appDescription.getMicroservices().stream().filter(m -> m.getTags().contains(tag)).collect(Collectors.toList());
+ }
+
+ public List<Nfr> getGroupNfrs(String tag) {
+ return appDescription.getNfrs().stream().filter(n -> n.getTags().contains(tag)).collect(Collectors.toList());
+ }
+
+ public List<Pattern> getGroupPatterns(String tag) {
+ return appDescription.getRecommendedPatterns().stream().filter(p -> p.getTags().contains(tag)).collect(Collectors.toList());
+ }
+
+ public String getJson() throws JsonProcessingException {
+ return new ObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(appDescription);
+
+ }
+
+ public String getMicroserviceName(String id) {
+ Microservice microservice = appDescription.getMicroservices().stream().filter(m -> m.getId().equalsIgnoreCase(id)).findFirst().orElse(null);
+ return microservice != null ? microservice.getName() : null;
+ }
+
+}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/AppManager.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/AppManager.java
index 7cc97ee5..7c84cdbd 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/AppManager.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/AppManager.java
@@ -1,11 +1,26 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
+
import eu.DECIDEh2020.appManager.exceptions.AppManagerException;
import eu.DECIDEh2020.appManager.exceptions.DECIDEValidationException;
import eu.DECIDEh2020.appManager.models.AppDescription;
import eu.DECIDEh2020.appManager.persistence.GitHandler;
+
import org.eclipse.jgit.api.errors.GitAPIException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -166,6 +181,10 @@ public class AppManager implements Closeable {
}
}
+ public void reset() {
+ gitHandler.resetAll();
+ }
+
@Override
public void close() throws IOException {
try {
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/HistoryFactory.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/HistoryFactory.java
index 6b8fcb68..28d9ed9a 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/HistoryFactory.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/HistoryFactory.java
@@ -1,7 +1,19 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager;
import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import eu.DECIDEh2020.appManager.exceptions.DECIDEValidationException;
@@ -9,6 +21,7 @@ import eu.DECIDEh2020.appManager.models.HistoryEntry;
import org.everit.json.schema.Schema;
import org.everit.json.schema.ValidationException;
import org.everit.json.schema.loader.SchemaLoader;
+import org.json.JSONArray;
import org.json.JSONObject;
import org.json.JSONTokener;
import org.slf4j.Logger;
@@ -57,7 +70,8 @@ public class HistoryFactory {
public static void validateHistory(List<HistoryEntry> history) throws DECIDEValidationException {
try {
- schema.validate(new ObjectMapper().writeValueAsString(history));
+ // must be a JSONArrat because the schema in optimus_history.schema.json declares it as an array -> otherwise the validation throws an error that a JSONObject must begin with '{'
+ schema.validate(new JSONArray(new ObjectMapper().writeValueAsString(history)));
} catch (JsonProcessingException e) {
log.error("json to string", e);
throw new DECIDEValidationException(e);
@@ -69,7 +83,7 @@ public class HistoryFactory {
public static void validateHistory(JsonNode history) throws DECIDEValidationException {
try {
- schema.validate(history.toString());
+ schema.validate(new JSONArray(history.toString()));
} catch (ValidationException e) {
log.error("validating json", e);
throw new DECIDEValidationException(e);
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/HistoryManager.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/HistoryManager.java
index f919937b..9e391ded 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/HistoryManager.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/HistoryManager.java
@@ -1,9 +1,23 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import eu.DECIDEh2020.appManager.exceptions.AppManagerException;
+import eu.DECIDEh2020.appManager.exceptions.DECIDEValidationException;
import eu.DECIDEh2020.appManager.models.HistoryEntry;
import eu.DECIDEh2020.appManager.persistence.GitHandler;
import org.eclipse.jgit.api.errors.GitAPIException;
@@ -26,7 +40,7 @@ public class HistoryManager {
private boolean strict = true;
- public static HistoryManager create(GitHandler gitHandler) {
+ static HistoryManager create(GitHandler gitHandler) {
return new HistoryManager(gitHandler);
}
@@ -50,16 +64,20 @@ public class HistoryManager {
this.strict = strict;
}
- public List<HistoryEntry> getHistory() throws AppManagerException, IOException {
+ public List<HistoryEntry> getHistory() throws DECIDEValidationException, IOException {
return Arrays.asList(new ObjectMapper().treeToValue(getHistoryAsTree(), HistoryEntry[].class));
}
- public ArrayNode getHistoryAsTree() throws AppManagerException, IOException {
+ public List<HistoryEntry> getHistory(Path path) throws AppManagerException, IOException {
+ return HistoryFactory.loadHistory(path);
+ }
+
+ public ArrayNode getHistoryAsTree() throws DECIDEValidationException, IOException {
ObjectMapper mapper = new ObjectMapper();
JsonNode history = mapper.createArrayNode();
Path path = gitHandler.getRepository().getPath().resolve(descriptor);
if (Files.exists(path)) {
- history = mapper.readTree(path.resolve(descriptor).toFile());
+ history = mapper.readTree(path.toFile());
if (strict) {
HistoryFactory.validateHistory(history);
}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/exceptions/AppManagerException.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/exceptions/AppManagerException.java
index 3d7f72ac..1119bb3f 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/exceptions/AppManagerException.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/exceptions/AppManagerException.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.exceptions;
public class AppManagerException extends Exception {
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/exceptions/DECIDEValidationException.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/exceptions/DECIDEValidationException.java
index cb874599..075daf79 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/exceptions/DECIDEValidationException.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/exceptions/DECIDEValidationException.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.exceptions;
public class DECIDEValidationException extends AppManagerException {
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/AppDescription.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/AppDescription.java
index f7692985..531fc6b8 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/AppDescription.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/AppDescription.java
@@ -1,16 +1,17 @@
/*
-* Copyright (c) 2017 Fraunhofer FOKUS.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the
-* Eclipse Public License version 2.0 which accompanies
-* this distribution, and is available at
-* https://opensource.org/licenses/EPL-2.0
-*
-* Contributors:
-*
-* Torben Jastrow (Fraunhofer FOKUS)
-*
-* **Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu */
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Torben Jastrow (Fraunhofer FOKUS)
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import java.util.ArrayList;
@@ -52,7 +53,7 @@ public class AppDescription {
private Monitoring monitoring;
- private String appInstanceId;
+ private String applicationInstanceId;
private Map<String, JsonNode> additionalProperties = new HashMap<>();
@@ -176,12 +177,12 @@ public class AppDescription {
this.recommendedPatterns = recommendedPatterns;
}
- public String getAppInstanceId() {
- return appInstanceId;
+ public String getApplicationInstanceId() {
+ return applicationInstanceId;
}
- public void setAppInstanceId(String appInstanceId) {
- this.appInstanceId = appInstanceId;
+ public void setApplicationInstanceId(String applicationInstanceId) {
+ this.applicationInstanceId = applicationInstanceId;
}
@JsonAnyGetter
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/AvailabilityNfr.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/AvailabilityNfr.java
index 30eb10e3..df4964e2 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/AvailabilityNfr.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/AvailabilityNfr.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.*;
@@ -12,16 +25,26 @@ import java.util.Map;
@JsonInclude(Include.NON_EMPTY)
public class AvailabilityNfr extends Nfr {
- private double quantitativeAvailability;
+ private String abstractValue;
+
+ private Double value;
private String unit;
- public double getQuantitativeAvailability() {
- return quantitativeAvailability;
+ public String getAbstractValue() {
+ return abstractValue;
+ }
+
+ public void setAbstractValue(String abstractValue) {
+ this.abstractValue = abstractValue;
+ }
+
+ public Double getValue() {
+ return value;
}
- public void setQuantitativeAvailability(double quantitativeAvailability) {
- this.quantitativeAvailability = quantitativeAvailability;
+ public void setValue(double value) {
+ this.value = value;
}
public String getUnit() {
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Container.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Container.java
index 13e1f191..3dba4682 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Container.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Container.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
@@ -13,13 +26,12 @@ import java.util.Map;
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class Container {
- private String id;
private String name;
private String imageName;
private String imageTag;
private String dockerPrivateRegistryIp;
- private int dockerPrivateRegistryPort;
+ private Integer dockerPrivateRegistryPort;
private String hostname;
private String restart;
@@ -31,31 +43,23 @@ public class Container {
private List<String> networks = new ArrayList<>();
- private Map<String, String> volumeMapping = new HashMap<>();
+ private List<VolumeMapping> volumeMapping = new ArrayList<>();
private List<String> environment = new ArrayList<>();
private String consulKvProviderNodeName;
- private boolean addConsulService;
+ private Integer addConsulService;
- private int consulServicePort;
+ private Integer consulServicePort;
- private boolean addConsulTraefikRules;
+ private Integer addConsulTraefikRules;
- private Map<Integer, Integer> portMapping = new HashMap<>();
+ private List<PortMapping> portMapping = new ArrayList<>();
- private Endpoint endpoints;
+ private List<Endpoint> endpoints = new ArrayList<>();
private Map<String, JsonNode> additionalProperties = new HashMap<>();
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
public String getName() {
return name;
}
@@ -88,11 +92,11 @@ public class Container {
this.dockerPrivateRegistryIp = dockerPrivateRegistryIp;
}
- public int getDockerPrivateRegistryPort() {
+ public Integer getDockerPrivateRegistryPort() {
return dockerPrivateRegistryPort;
}
- public void setDockerPrivateRegistryPort(int dockerPrivateRegistryPort) {
+ public void setDockerPrivateRegistryPort(Integer dockerPrivateRegistryPort) {
this.dockerPrivateRegistryPort = dockerPrivateRegistryPort;
}
@@ -144,11 +148,11 @@ public class Container {
this.networks = networks;
}
- public Map<String, String> getVolumeMapping() {
+ public List<VolumeMapping> getVolumeMapping() {
return volumeMapping;
}
- public void setVolumeMapping(Map<String, String> volumeMapping) {
+ public void setVolumeMapping(List<VolumeMapping> volumeMapping) {
this.volumeMapping = volumeMapping;
}
@@ -168,38 +172,46 @@ public class Container {
this.consulKvProviderNodeName = consulKvProviderNodeName;
}
- public boolean isAddConsulService() {
+ public Integer getAddConsulService() {
return addConsulService;
}
- public void setAddConsulService(boolean addConsulService) {
+ public void setAddConsulService(Integer addConsulService) {
this.addConsulService = addConsulService;
}
- public boolean isAddConsulTraefikRules() {
- return addConsulTraefikRules;
- }
-
- public void setAddConsulTraefikRules(boolean addConsulTraefikRules) {
- this.addConsulTraefikRules = addConsulTraefikRules;
- }
-
- public Map<Integer, Integer> getPortMapping() {
+ public List<PortMapping> getPortMapping() {
return portMapping;
}
- public void setPortMapping(Map<Integer, Integer> portMapping) {
+ public void setPortMapping(List<PortMapping> portMapping) {
this.portMapping = portMapping;
}
- public Endpoint getEndpoints() {
+ public List<Endpoint> getEndpoints() {
return endpoints;
}
- public void setEndpoints(Endpoint endpoints) {
+ public void setEndpoints(List<Endpoint> endpoints) {
this.endpoints = endpoints;
}
+ public Integer getConsulServicePort() {
+ return consulServicePort;
+ }
+
+ public void setConsulServicePort(Integer consulServicePort) {
+ this.consulServicePort = consulServicePort;
+ }
+
+ public void setAddConsulTraefikRules(Integer addConsulTraefikRules) {
+ this.addConsulTraefikRules = addConsulTraefikRules;
+ }
+
+ public Integer getAddConsulTraefikRules() {
+ return addConsulTraefikRules;
+ }
+
@JsonAnyGetter
public Map<String, JsonNode> getAdditionalProperties() {
return additionalProperties;
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/CostNfr.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/CostNfr.java
index 65be7886..b2c20b18 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/CostNfr.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/CostNfr.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -6,16 +19,26 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@JsonInclude(Include.NON_EMPTY)
public class CostNfr extends Nfr {
- private double quantitativeCost;
+ private String abstractValue;
+
+ private Double value;
private String unit;
- public double getQuantitativeCost() {
- return quantitativeCost;
+ public String getAbstractValue() {
+ return abstractValue;
+ }
+
+ public void setAbstractValue(String abstractValue) {
+ this.abstractValue = abstractValue;
}
- public void setQuantitativeCost(double quantitativeCost) {
- this.quantitativeCost = quantitativeCost;
+ public Double getValue() {
+ return value;
+ }
+
+ public void setValue(Double value) {
+ this.value = value;
}
public String getUnit() {
@@ -25,4 +48,5 @@ public class CostNfr extends Nfr {
public void setUnit(String unit) {
this.unit = unit;
}
+
}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/DetachableResource.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/DetachableResource.java
index 5303f952..48b5b0bc 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/DetachableResource.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/DetachableResource.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -9,8 +22,8 @@ public class DetachableResource {
private String id;
private String name;
- private boolean db;
- private boolean sql;
+ private Boolean db;
+ private Boolean sql;
private String specificDb;
private String size;
private String classification;
@@ -28,11 +41,11 @@ public class DetachableResource {
this.id = id;
}
- public boolean isDb() {
+ public Boolean isDb() {
return db;
}
- public void setDb(boolean db) {
+ public void setDb(Boolean db) {
this.db = db;
}
@@ -48,11 +61,11 @@ public class DetachableResource {
this.name = name;
}
- public boolean isSql() {
+ public Boolean isSql() {
return sql;
}
- public void setSql(boolean sql) {
+ public void setSql(Boolean sql) {
this.sql = sql;
}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Endpoint.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Endpoint.java
index 1848e3dd..a06d2faf 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Endpoint.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Endpoint.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -8,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonInclude;
public class Endpoint {
private String protocol;
- private int port;
- private boolean skipRule;
- private boolean containerNameOverride;
+ private Integer port;
+ private Integer skipRule;
+ private String containerNameOverride;
public String getProtocol() {
return protocol;
@@ -20,27 +33,27 @@ public class Endpoint {
this.protocol = protocol;
}
- public int getPort() {
+ public Integer getPort() {
return port;
}
- public void setPort(int port) {
+ public void setPort(Integer port) {
this.port = port;
}
- public boolean isSkipRule() {
+ public Integer getSkipRule() {
return skipRule;
}
- public void setSkipRule(boolean skipRule) {
+ public void setSkipRule(Integer skipRule) {
this.skipRule = skipRule;
}
- public boolean isContainerNameOverride() {
+ public String getContainerNameOverride() {
return containerNameOverride;
}
- public void setContainerNameOverride(boolean containerNameOverride) {
+ public void setContainerNameOverride(String containerNameOverride) {
this.containerNameOverride = containerNameOverride;
}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Expression.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Expression.java
index d779bc7b..656ae327 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Expression.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Expression.java
@@ -1,16 +1,16 @@
/*
-* Copyright (c) 2017 Fraunhofer FOKUS.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the
-* <<licensing_schema_to_be_decided>> which accompanies
-* this distribution, and is available at
-* https://opensource.org/licenses/EPL-2.0
-*
-* Contributors:
-*
-* Majid Salehi Ghamsari Fraunhofer FOKUS
-**Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
-*/
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/HistoricalDeployment.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/HistoricalDeployment.java
index 5fe746c9..8bf045d4 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/HistoricalDeployment.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/HistoricalDeployment.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/HistoryEntry.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/HistoryEntry.java
index c3522e64..e78fd7ea 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/HistoryEntry.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/HistoryEntry.java
@@ -1,10 +1,24 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -12,7 +26,9 @@ public class HistoryEntry {
private String date;
- private Map<String, HistoricalDeployment> deployments = new HashMap<>();
+ private SchemaElement schema = new SchemaElement();
+
+ private List<ObjectNode> slaBreaches = new ArrayList<>();
public String getDate() {
return date;
@@ -22,12 +38,20 @@ public class HistoryEntry {
this.date = date;
}
- public Map<String, HistoricalDeployment> getDeployments() {
- return deployments;
+ public SchemaElement getSchema() {
+ return schema;
+ }
+
+ public void setSchema(SchemaElement schema) {
+ this.schema = schema;
}
- public void setDeployments(Map<String, HistoricalDeployment> deployments) {
- this.deployments = deployments;
+ public List<ObjectNode> getSlaBreaches() {
+ return slaBreaches;
}
-
+
+ public void setSlaBreaches(List<ObjectNode> slaBreaches) {
+ this.slaBreaches = slaBreaches;
+ }
+
}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/InfrastructureRequirements.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/InfrastructureRequirements.java
index c9d60413..3bae7812 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/InfrastructureRequirements.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/InfrastructureRequirements.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/LocationNfr.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/LocationNfr.java
index 27915cfe..6fdca37c 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/LocationNfr.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/LocationNfr.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -8,34 +21,24 @@ import java.util.List;
@JsonInclude(Include.NON_EMPTY)
public class LocationNfr extends Nfr {
- private List<String> qualitativeRegions;
+ private String abstractValue;
- private List<String> qualitativeCountries;
+ private List<String> value;
- private String qualitativePolicy;
-
- public List<String> getQualitativeRegions() {
- return qualitativeRegions;
- }
-
- public void setQualitativeRegions(List<String> qualitativeRegions) {
- this.qualitativeRegions = qualitativeRegions;
- }
-
- public List<String> getQualitativeCountries() {
- return qualitativeCountries;
+ public String getAbstractValue() {
+ return abstractValue;
}
- public void setQualitativeCountries(List<String> qualitativeCountries) {
- this.qualitativeCountries = qualitativeCountries;
+ public void setAbstractValue(String abstractValue) {
+ this.abstractValue = abstractValue;
}
- public String getQualitativePolicy() {
- return qualitativePolicy;
+ public List<String> getValue() {
+ return value;
}
- public void setQualitativePolicy(String qualitativePolicy) {
- this.qualitativePolicy = qualitativePolicy;
+ public void setValue(List<String> value) {
+ this.value = value;
}
}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Mcsla.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Mcsla.java
index 0062cdc2..1af89ce1 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Mcsla.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Mcsla.java
@@ -1,18 +1,17 @@
-package eu.DECIDEh2020.appManager.models;
/*
-* Copyright (c) 2017 Fraunhofer FOKUS.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the
-* <<licensing_schema_to_be_decided>> which accompanies
-* this distribution, and is available at
-* https://opensource.org/licenses/EPL-2.0
-*
-* Contributors:
-* Majid Salehi Ghamsari Fraunhofer FOKUS
-* Simon Dutkowski Fraunhofer FOKUS
-*
-* Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
-*/
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
+package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Metric.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Metric.java
index 0d395d27..2d194ae5 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Metric.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Metric.java
@@ -1,16 +1,16 @@
/*
-* Copyright (c) 2017 Fraunhofer FOKUS.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the
-* <<licensing_schema_to_be_decided>> which accompanies
-* this distribution, and is available at
-* https://opensource.org/licenses/EPL-2.0
-*
-* Contributors:
-*
-* Majid Salehi Ghamsari Fraunhofer FOKUS
-**Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
-*/
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -35,7 +35,7 @@ public class Metric {
private List<Parameter> parameters = new ArrayList<>();
- private List<String> underlyingMetrics = new ArrayList<>();
+ private List<Metric> underlyingMetrics = new ArrayList<>();
public String getId() {
return id;
@@ -101,11 +101,11 @@ public class Metric {
this.parameters = parameters;
}
- public List<String> getUnderlyingMetrics() {
+ public List<Metric> getUnderlyingMetrics() {
return underlyingMetrics;
}
- public void setUnderlyingMetrics(List<String> underlyingMetrics) {
+ public void setUnderlyingMetrics(List<Metric> underlyingMetrics) {
this.underlyingMetrics = underlyingMetrics;
}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Microservice.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Microservice.java
index f4ae4476..cfc0bd00 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Microservice.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Microservice.java
@@ -1,17 +1,18 @@
/*
-* Copyright (c) 2017 Fraunhofer FOKUS.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the
-* Eclipse Public License version 2.0 which accompanies
-* this distribution, and is available at
-* https://opensource.org/licenses/EPL-2.0
-*
-* Contributors:
-*
-* Torben Jastrow (Fraunhofer FOKUS)
-*
-* **Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu */
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
+
import java.util.ArrayList;
import java.util.List;
@@ -26,15 +27,15 @@ public class Microservice {
private String id;
private String name;
private String classification;
- private boolean stateful = false;
+ private Boolean stateful = false;
private String programmingLanguage;
private String sourceRepository;
private List<String> tags = new ArrayList<>();
- private boolean publicIP = false;
+ private Boolean publicIP = false;
private List<String> endpoints = new ArrayList<>();
private String containerId;
private String containerRef;
- private int deploymentOrder;
+ private Integer deploymentOrder;
private List<String> dependencies = new ArrayList<>();
private List<String> safeMethods = new ArrayList<>();
private List<DetachableResource> detachableResources = new ArrayList<>();
@@ -64,11 +65,11 @@ public class Microservice {
this.classification = classification;
}
- public boolean isStateful() {
+ public Boolean isStateful() {
return stateful;
}
- public void setStateful(boolean stateful) {
+ public void setStateful(Boolean stateful) {
this.stateful = stateful;
}
@@ -100,11 +101,11 @@ public class Microservice {
this.tags = tags;
}
- public boolean isPublicIP() {
+ public Boolean isPublicIP() {
return publicIP;
}
- public void setPublicIP(boolean publicIP) {
+ public void setPublicIP(Boolean publicIP) {
this.publicIP = publicIP;
}
@@ -132,11 +133,11 @@ public class Microservice {
this.containerRef = containerRef;
}
- public int getDeploymentOrder() {
+ public Integer getDeploymentOrder() {
return deploymentOrder;
}
- public void setDeploymentOrder(int deploymentOrder) {
+ public void setDeploymentOrder(Integer deploymentOrder) {
this.deploymentOrder = deploymentOrder;
}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Monitoring.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Monitoring.java
index 9949e564..9d4f1a52 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Monitoring.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Monitoring.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -9,14 +22,14 @@ import java.util.List;
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class Monitoring {
- private boolean status;
+ private Boolean status;
private List<String> urls = new ArrayList<>();
- public boolean getStatus() {
+ public Boolean getStatus() {
return status;
}
- public void setStatus(boolean status) {
+ public void setStatus(Boolean status) {
this.status = status;
}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Nfr.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Nfr.java
index a6c81d68..f3ef94a4 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Nfr.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Nfr.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.*;
@@ -12,30 +25,30 @@ import java.util.Map;
@JsonTypeInfo(
use = JsonTypeInfo.Id.NAME,
include = JsonTypeInfo.As.PROPERTY,
- property = "kind",
+ property = "type",
visible = true)
@JsonSubTypes({
- @JsonSubTypes.Type(value = AvailabilityNfr.class, name = "availability"),
- @JsonSubTypes.Type(value = PerformanceNfr.class, name = "performance"),
- @JsonSubTypes.Type(value = ScalabilityNfr.class, name = "scalability"),
- @JsonSubTypes.Type(value = LocationNfr.class, name = "location"),
- @JsonSubTypes.Type(value = CostNfr.class, name = "cost")})
+ @JsonSubTypes.Type(value = AvailabilityNfr.class, name = "Availability"),
+ @JsonSubTypes.Type(value = PerformanceNfr.class, name = "Performance"),
+ @JsonSubTypes.Type(value = ScalabilityNfr.class, name = "Scalability"),
+ @JsonSubTypes.Type(value = LocationNfr.class, name = "Location"),
+ @JsonSubTypes.Type(value = CostNfr.class, name = "Cost")})
@JsonInclude(Include.NON_EMPTY)
public class Nfr {
@JsonTypeId
- private String kind;
+ private String type;
private List<String> tags = new ArrayList<>();
private Map<String, JsonNode> additionalProperties = new HashMap<>();
- public String getKind() {
- return kind;
+ public String getType() {
+ return type;
}
- public void setKind(String kind) {
- this.kind = kind;
+ public void setType(String type) {
+ this.type = type;
}
public List<String> getTags() {
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Parameter.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Parameter.java
index 72de122b..d96e30a3 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Parameter.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Parameter.java
@@ -1,17 +1,17 @@
-package eu.DECIDEh2020.appManager.models;
/*
-* Copyright (c) 2017 Fraunhofer FOKUS.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the
-* <<licensing_schema_to_be_decided>> which accompanies
-* this distribution, and is available at
-* https://opensource.org/licenses/EPL-2.0
-*
-* Contributors:
-*
-* Majid Salehi Ghamsari Fraunhofer FOKUS
-**Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
-*/
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
+package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Pattern.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Pattern.java
index f15a5b81..57d1a849 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Pattern.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Pattern.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
@@ -19,6 +32,12 @@ public class Pattern {
private List<String> tags = new ArrayList<>();
+ private List<String> positiveImpacts = new ArrayList<>();
+
+ private List<String> categories = new ArrayList<>();
+
+ private Boolean selected = false;
+
private Map<String, JsonNode> additionalProperties = new HashMap<>();
public String getTitle() {
@@ -45,6 +64,30 @@ public class Pattern {
this.tags = tags;
}
+ public List<String> getPositiveImpacts() {
+ return positiveImpacts;
+ }
+
+ public void setPositiveImpacts(List<String> positiveImpacts) {
+ this.positiveImpacts = positiveImpacts;
+ }
+
+ public List<String> getCategories() {
+ return categories;
+ }
+
+ public void setCategories(List<String> categories) {
+ this.categories = categories;
+ }
+
+ public Boolean isSelected() {
+ return selected;
+ }
+
+ public void setSelected(Boolean selected) {
+ this.selected = selected;
+ }
+
@JsonAnyGetter
public Map<String, JsonNode> getAdditionalProperties() {
return additionalProperties;
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/PerformanceNfr.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/PerformanceNfr.java
index d3a68b5b..89fcc527 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/PerformanceNfr.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/PerformanceNfr.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -6,16 +19,26 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@JsonInclude(Include.NON_EMPTY)
public class PerformanceNfr extends Nfr {
- private double quantitativeResponseTime;
+ private String abstractValue;
+
+ private Double value;
private String unit;
- public double getQuantitativeResponseTime() {
- return quantitativeResponseTime;
+ public String getAbstractValue() {
+ return abstractValue;
+ }
+
+ public void setAbstractValue(String abstractValue) {
+ this.abstractValue = abstractValue;
}
- public void setQuantitativeResponseTime(double quantitativeResponseTime) {
- this.quantitativeResponseTime = quantitativeResponseTime;
+ public Double getValue() {
+ return value;
+ }
+
+ public void setValue(Double value) {
+ this.value = value;
}
public String getUnit() {
@@ -25,4 +48,5 @@ public class PerformanceNfr extends Nfr {
public void setUnit(String unit) {
this.unit = unit;
}
+
}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/PortMapping.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/PortMapping.java
index 4aac9af7..b7689c80 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/PortMapping.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/PortMapping.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Remedy.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Remedy.java
index 934ebcfe..89b7244b 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Remedy.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Remedy.java
@@ -1,16 +1,16 @@
/*
-* Copyright (c) 2017 Fraunhofer FOKUS.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the
-* <<licensing_schema_to_be_decided>> which accompanies
-* this distribution, and is available at
-* https://opensource.org/licenses/EPL-2.0
-*
-* Contributors:
-*
-* Majid Salehi Ghamsari Fraunhofer FOKUS
-**Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
-*/
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
public class Remedy {
private String type;
- private int value;
+ private Integer value;
private String unit;
private String validity;
@@ -38,7 +38,7 @@ public class Remedy {
return validity;
}
- public int getValue() {
+ public Integer getValue() {
return value;
}
@@ -54,7 +54,7 @@ public class Remedy {
this.validity = validity;
}
- public void setValue(int value) {
+ public void setValue(Integer value) {
this.value = value;
}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/ScalabilityNfr.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/ScalabilityNfr.java
index c03575fe..10483322 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/ScalabilityNfr.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/ScalabilityNfr.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -8,14 +21,34 @@ import java.util.List;
@JsonInclude(Include.NON_EMPTY)
public class ScalabilityNfr extends Nfr {
- private List<String> scaleBy;
+ private String abstractValue;
- public List<String> getScaleBy() {
- return scaleBy;
+ private Double value;
+
+ private String unit;
+
+ public String getAbstractValue() {
+ return abstractValue;
+ }
+
+ public void setAbstractValue(String abstractValue) {
+ this.abstractValue = abstractValue;
+ }
+
+ public Double getValue() {
+ return value;
+ }
+
+ public void setValue(Double value) {
+ this.value = value;
+ }
+
+ public String getUnit() {
+ return unit;
}
- public void setScaleBy(List<String> scaleBy) {
- this.scaleBy = scaleBy;
+ public void setUnit(String unit) {
+ this.unit = unit;
}
}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/SchemaElement.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/SchemaElement.java
index b688d1cf..6b0460af 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/SchemaElement.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/SchemaElement.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -13,7 +26,7 @@ public class SchemaElement {
private String csId;
- private int index;
+ private Integer index;
public List<String> getMicroservices() {
return microservices;
@@ -31,11 +44,11 @@ public class SchemaElement {
this.csId = csId;
}
- public int getIndex() {
+ public Integer getIndex() {
return index;
}
- public void setIndex(int index) {
+ public void setIndex(Integer index) {
this.index = index;
}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/ServiceObjective.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/ServiceObjective.java
index 0731de7f..2328cf76 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/ServiceObjective.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/ServiceObjective.java
@@ -1,17 +1,18 @@
-package eu.DECIDEh2020.appManager.models;
/*
-* Copyright (c) 2017 Fraunhofer FOKUS.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the
-* <<licensing_schema_to_be_decided>> which accompanies
-* this distribution, and is available at
-* https://opensource.org/licenses/EPL-2.0
-*
-* Contributors:
-*
-* Majid Salehi Ghamsari Fraunhofer FOKUS
-**Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
-*/
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
+package eu.DECIDEh2020.appManager.models;
+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -25,13 +26,12 @@ public class ServiceObjective {
private String comment;
private String termName;
- private String monitoringResult;
private String type;
- private double value;
+ private String value;
private String unit;
- private String calculationFormula;
+ private String conditionStatement;
private List<ViolationTriggerRule> violationTriggerRules = new ArrayList<>();
private Remedy remedy;
private List<Metric> metrics = new ArrayList<>();
@@ -60,19 +60,11 @@ public class ServiceObjective {
this.type = type;
}
- public String getMonitoringResult() {
- return monitoringResult;
- }
-
- public void setMonitoringResult(String monitoringResult) {
- this.monitoringResult = monitoringResult;
- }
-
- public double getValue() {
+ public String getValue() {
return value;
}
- public void setValue(double value) {
+ public void setValue(String value) {
this.value = value;
}
@@ -84,12 +76,12 @@ public class ServiceObjective {
this.unit = unit;
}
- public String getCalculationFormula() {
- return calculationFormula;
+ public String getConditionStatement() {
+ return conditionStatement;
}
- public void setCalculationFormula(String calculationFormula) {
- this.calculationFormula = calculationFormula;
+ public void setConditionStatement(String conditionStatement) {
+ this.conditionStatement = conditionStatement;
}
public List<ViolationTriggerRule> getViolationTriggerRules() {
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Sla.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Sla.java
index a265995b..f6f6bae4 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Sla.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/Sla.java
@@ -1,18 +1,18 @@
-package eu.DECIDEh2020.appManager.models;
/*
-* Copyright (c) 2017 Fraunhofer FOKUS.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the
-* <<licensing_schema_to_be_decided>> which accompanies
-* this distribution, and is available at
-* https://opensource.org/licenses/EPL-2.0
-*
-* Contributors:
-* Majid Salehi Ghamsari Fraunhofer FOKUS
-* Simon Dutkowski Fraunhofer FOKUS
-*
-* Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
-*/
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
+package eu.DECIDEh2020.appManager.models;
+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -28,7 +28,7 @@ public class Sla {
private String visibility;
- private int validityPeriod;
+ private Integer validityPeriod;
private List<String> coveredServices = new ArrayList<>();
@@ -54,11 +54,11 @@ public class Sla {
this.visibility = visibility;
}
- public int getValidityPeriod() {
+ public Integer getValidityPeriod() {
return validityPeriod;
}
- public void setValidityPeriod(int validityPeriod) {
+ public void setValidityPeriod(Integer validityPeriod) {
this.validityPeriod = validityPeriod;
}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/ViolationTriggerRule.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/ViolationTriggerRule.java
index 3244d15f..56543a1a 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/ViolationTriggerRule.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/ViolationTriggerRule.java
@@ -1,16 +1,16 @@
/*
-* Copyright (c) 2017 Fraunhofer FOKUS.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the
-* <<licensing_schema_to_be_decided>> which accompanies
-* this distribution, and is available at
-* https://opensource.org/licenses/EPL-2.0
-*
-* Contributors:
-*
-* Majid Salehi Ghamsari Fraunhofer FOKUS
-**Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
-*/
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -20,22 +20,22 @@ import com.fasterxml.jackson.annotation.JsonInclude;
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class ViolationTriggerRule {
- private int breachesCount;
- private int violationInterval;
+ private Integer breachesCount;
+ private Integer violationInterval;
- public int getBreachesCount() {
+ public Integer getBreachesCount() {
return breachesCount;
}
- public int getViolationInterval() {
- return violationInterval;
+ public void setBreachesCount(Integer breachesCount) {
+ this.breachesCount = breachesCount;
}
- public void setBreachesCount(int breachesCount) {
- this.breachesCount = breachesCount;
+ public Integer getViolationInterval() {
+ return violationInterval;
}
- public void setViolationInterval(int violationInterval) {
+ public void setViolationInterval(Integer violationInterval) {
this.violationInterval = violationInterval;
}
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/VirtualMachine.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/VirtualMachine.java
index 163c0c4b..26394d31 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/VirtualMachine.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/VirtualMachine.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
@@ -18,9 +31,9 @@ public class VirtualMachine {
private String cspId;
private String cspName;
- private int ram;
- private int cores;
- private int storage;
+ private Integer ram;
+ private Integer cores;
+ private Integer storage;
private String image;
private String cloudBrokerEndpoint;
@@ -38,13 +51,12 @@ public class VirtualMachine {
private String consulJoinIp;
private String dockerPrivateRegistryIp;
- private int dockerPrivateRegistryPPort;
+ private Integer dockerPrivateRegistryPPort;
private String dockerHostNodeName;
private String dockerHostPublicIp;
private Map<String, JsonNode> additionalProperties = new HashMap<>();
-
public String getId() {
return id;
}
@@ -69,27 +81,27 @@ public class VirtualMachine {
this.cspName = cspName;
}
- public int getRam() {
+ public Integer getRam() {
return ram;
}
- public void setRam(int ram) {
+ public void setRam(Integer ram) {
this.ram = ram;
}
- public int getCores() {
+ public Integer getCores() {
return cores;
}
- public void setCores(int cores) {
+ public void setCores(Integer cores) {
this.cores = cores;
}
- public int getStorage() {
+ public Integer getStorage() {
return storage;
}
- public void setStorage(int storage) {
+ public void setStorage(Integer storage) {
this.storage = storage;
}
@@ -101,6 +113,118 @@ public class VirtualMachine {
this.image = image;
}
+ public String getCloudBrokerEndpoint() {
+ return cloudBrokerEndpoint;
+ }
+
+ public void setCloudBrokerEndpoint(String cloudBrokerEndpoint) {
+ this.cloudBrokerEndpoint = cloudBrokerEndpoint;
+ }
+
+ public String getCloudBrokerUsername() {
+ return cloudBrokerUsername;
+ }
+
+ public void setCloudBrokerUsername(String cloudBrokerUsername) {
+ this.cloudBrokerUsername = cloudBrokerUsername;
+ }
+
+ public String getCloudBrokerPassword() {
+ return cloudBrokerPassword;
+ }
+
+ public void setCloudBrokerPassword(String cloudBrokerPassword) {
+ this.cloudBrokerPassword = cloudBrokerPassword;
+ }
+
+ public String getVmSoftwareId() {
+ return vmSoftwareId;
+ }
+
+ public void setVmSoftwareId(String vmSoftwareId) {
+ this.vmSoftwareId = vmSoftwareId;
+ }
+
+ public String getVmResourceId() {
+ return vmResourceId;
+ }
+
+ public void setVmResourceId(String vmResourceId) {
+ this.vmResourceId = vmResourceId;
+ }
+
+ public String getVmRegionId() {
+ return vmRegionId;
+ }
+
+ public void setVmRegionId(String vmRegionId) {
+ this.vmRegionId = vmRegionId;
+ }
+
+ public String getInstanceTypeId() {
+ return instanceTypeId;
+ }
+
+ public void setInstanceTypeId(String instanceTypeId) {
+ this.instanceTypeId = instanceTypeId;
+ }
+
+ public String getKeyPairId() {
+ return keyPairId;
+ }
+
+ public void setKeyPairId(String keyPairId) {
+ this.keyPairId = keyPairId;
+ }
+
+ public List<Integer> getOpenedPorts() {
+ return openedPorts;
+ }
+
+ public void setOpenedPorts(List<Integer> openedPorts) {
+ this.openedPorts = openedPorts;
+ }
+
+ public String getConsulJoinIp() {
+ return consulJoinIp;
+ }
+
+ public void setConsulJoinIp(String consulJoinIp) {
+ this.consulJoinIp = consulJoinIp;
+ }
+
+ public String getDockerPrivateRegistryIp() {
+ return dockerPrivateRegistryIp;
+ }
+
+ public void setDockerPrivateRegistryIp(String dockerPrivateRegistryIp) {
+ this.dockerPrivateRegistryIp = dockerPrivateRegistryIp;
+ }
+
+ public Integer getDockerPrivateRegistryPPort() {
+ return dockerPrivateRegistryPPort;
+ }
+
+ public void setDockerPrivateRegistryPPort(Integer dockerPrivateRegistryPPort) {
+ this.dockerPrivateRegistryPPort = dockerPrivateRegistryPPort;
+ }
+
+ public String getDockerHostNodeName() {
+ return dockerHostNodeName;
+ }
+
+ public void setDockerHostNodeName(String dockerHostNodeName) {
+ this.dockerHostNodeName = dockerHostNodeName;
+ }
+
+ public String getDockerHostPublicIp() {
+ return dockerHostPublicIp;
+ }
+
+ public void setDockerHostPublicIp(String dockerHostPublicIp) {
+ this.dockerHostPublicIp = dockerHostPublicIp;
+ }
+
@JsonAnyGetter
public Map<String, JsonNode> getAdditionalProperties() {
return additionalProperties;
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/VolumeMapping.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/VolumeMapping.java
index 5c91a1f8..73bb9651 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/models/VolumeMapping.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/models/VolumeMapping.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/AppController/src/main/java/eu/DECIDEh2020/appManager/persistence/GitHandler.java b/AppController/src/main/java/eu/DECIDEh2020/appManager/persistence/GitHandler.java
index 5c477db7..762c4bc0 100644
--- a/AppController/src/main/java/eu/DECIDEh2020/appManager/persistence/GitHandler.java
+++ b/AppController/src/main/java/eu/DECIDEh2020/appManager/persistence/GitHandler.java
@@ -1,17 +1,16 @@
/*
-* Copyright (c) 2017 Fraunhofer FOKUS.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the
-* Eclipse Public License version 2.0 which accompanies
-* this distribution, and is available at
-* https://opensource.org/licenses/EPL-2.0
-*
-* Contributors:
-*
-* Torben Jastrow (Fraunhofer FOKUS)
-*
-*
-**Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu */
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager.persistence;
import java.io.IOException;
@@ -19,36 +18,33 @@ import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
+import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Iterator;
import org.eclipse.jgit.api.*;
-import org.eclipse.jgit.api.errors.CanceledException;
-import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
-import org.eclipse.jgit.api.errors.DetachedHeadException;
import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.api.errors.InvalidConfigurationException;
import org.eclipse.jgit.api.errors.InvalidRemoteException;
import org.eclipse.jgit.api.errors.JGitInternalException;
-import org.eclipse.jgit.api.errors.NoFilepatternException;
-import org.eclipse.jgit.api.errors.NoHeadException;
-import org.eclipse.jgit.api.errors.NoMessageException;
-import org.eclipse.jgit.api.errors.RefNotFoundException;
-import org.eclipse.jgit.api.errors.TransportException;
-import org.eclipse.jgit.api.errors.WrongRepositoryStateException;
import org.eclipse.jgit.merge.MergeStrategy;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.eclipse.jgit.transport.*;
+import org.eclipse.jgit.util.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GitHandler {
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
public static class Repository {
Path path;
private String uri, host, user, password, name, port, protocol;
- private boolean secureStorage, newRepo = true, localRepo = true;
+ private boolean newRepo = true, localRepo = true;
private String token;
- public Repository(String uri, Path path, String host, String user, String password, String port, String name, String protocol, boolean secureStorage) {
+ public Repository(String uri, Path path, String host, String user, String password, String port, String name, String protocol) {
this.uri = uri;
this.path = path;
this.host = host;
@@ -57,7 +53,6 @@ public class GitHandler {
this.port = port;
this.protocol = protocol;
this.password = password;
- this.secureStorage = secureStorage;
}
public Repository() {
@@ -139,22 +134,6 @@ public class GitHandler {
this.password = password;
}
- /**
- * @return the secureStorage
- */
- public boolean isSecureStorage() {
- return secureStorage;
- }
-
- /**
- * @param secureStorage
- * the secureStorage to set
- */
- public void setSecureStorage(boolean secureStorage) {
- this.secureStorage = secureStorage;
- }
-
-
/**
* @return the name
*/
@@ -299,18 +278,24 @@ public class GitHandler {
try {
Iterator<PushResult> it = pc.call().iterator();
if (it.hasNext()) {
- System.out.println(it.next().toString());
+ log.debug(it.next().toString());
}
} catch (InvalidRemoteException e) {
- e.printStackTrace();
+ log.error("push to repo", e);
}
}
public void pullFromRepo() throws GitAPIException {
- PullResult result = git.pull().setCredentialsProvider(cp).call();
- if (!result.isSuccessful()) {
- git.pull().setStrategy(MergeStrategy.THEIRS).setCredentialsProvider(cp).call();
+ try {
+ PullResult result = git.pull().setCredentialsProvider(cp).setStrategy(MergeStrategy.RESOLVE).call();
+ if (result.isSuccessful()) {
+ return;
+ }
+ } catch (GitAPIException e) {
+ log.error("standard pull", e);
}
+ resetMerging();
+ git.pull().setStrategy(MergeStrategy.THEIRS).setCredentialsProvider(cp).call();
}
public void setCredentials(String name,String password) {
@@ -363,9 +348,32 @@ public class GitHandler {
}
} catch (MalformedURLException e) {
-
+ log.error("repo url parsing", e);
} catch (UnsupportedEncodingException e) {
+ log.error("token encoding", e);
+ }
+ }
+ private void resetMerging() throws GitAPIException {
+ try {
+ git.getRepository().writeMergeCommitMsg( null );
+ git.getRepository().writeMergeHeads( null );
+ } catch (IOException e) {
+ log.error("abort merging", e);
+ }
+ git.reset().setMode( ResetCommand.ResetType.HARD ).call();
+ }
+
+ public void resetAll() {
+ git.getRepository().close();
+ close();
+ try {
+ FileUtils.delete(repository.getPath().toFile(), FileUtils.RECURSIVE | FileUtils.IGNORE_ERRORS);
+ log.debug("directory deleted");
+ log.debug("exists {}", Files.exists(repository.getPath()));
+ cloneRepo();
+ } catch (GitAPIException | IOException e) {
+ log.error("reset cloned repo", e);
}
}
diff --git a/AppController/src/main/resources/application_description.schema.json b/AppController/src/main/resources/application_description.schema.json
index 216e14fa..6b8da688 100644
--- a/AppController/src/main/resources/application_description.schema.json
+++ b/AppController/src/main/resources/application_description.schema.json
@@ -93,7 +93,7 @@
"$ref": "#/definitions/Container"
}
},
- "appInstanceId": {
+ "applicationInstanceId": {
"type": "string"
}
},
@@ -190,10 +190,10 @@
},
"Nfr": {
"type": "object",
- "required": [ "kind" ],
+ "required": [ "type" ],
"properties": {
- "kind": {
- "enum": [ "availability", "performance", "scalability", "location", "cost" ]
+ "type": {
+ "enum": [ "Availability", "Performance", "Scalability", "Location", "Cost" ]
},
"tags": {
"type": "array",
@@ -211,12 +211,16 @@
},
{
"type": "object",
- "required": [ "quantitativeAvailability", "unit" ],
+ "required": [ "abstractValue", "value" ],
"properties": {
- "kind": {
- "const": "availability"
+ "type": {
+ "const": "Availability"
+ },
+ "abstractValue": {
+ "type": "string",
+ "enum": [ "Low", "Medium", "High" ]
},
- "quantitativeAvailability": {
+ "value": {
"type": "number",
"minimum": 0,
"maximum": 100
@@ -235,12 +239,16 @@
},
{
"type": "object",
- "required": [ "quantitativeResponseTime", "unit" ],
+ "required": [ "abstractValue", "value" ],
"properties": {
- "kind": {
- "const": "performance"
+ "type": {
+ "const": "Performance"
+ },
+ "abstractValue": {
+ "type": "string",
+ "enum": [ "Low", "Medium", "High" ]
},
- "quantitativeResponseTime": {
+ "value": {
"type": "number",
"exclusiveMinimum": 0
},
@@ -258,20 +266,20 @@
},
{
"type": "object",
- "required": [ "scaleBy" ],
+ "required": [ "abstractValue", "value" ],
"properties": {
- "kind": {
- "const": "scalability"
+ "type": {
+ "const": "Scalability"
},
- "scaleBy": {
- "type": "array",
- "items": {
- "enum": [
- "messageCount",
- "processorLoad"
- ]
- },
- "uniqueItems": true
+ "abstractValue": {
+ "type": "string",
+ "enum": [ "Low", "Medium", "High" ]
+ },
+ "value": {
+ "type": "number"
+ },
+ "unit": {
+ "type": "string"
}
}
}
@@ -284,27 +292,21 @@
},
{
"type": "object",
- "required": [ "qualitativeRegions", "qualitativeCountries" ],
+ "required": [ "abstractValue", "value" ],
"properties": {
- "kind": {
- "const": "location"
+ "type": {
+ "const": "Location"
},
- "qualitativeRegions": {
- "type": "array",
- "items": {
- "type": "string"
- },
- "uniqueItems": true
+ "abstractValue": {
+ "type": "string",
+ "enum": [ "Single Location", "Single Country", "Cross Border" ]
},
- "qualitativeCountries": {
+ "value": {
"type": "array",
"items": {
"type": "string"
},
"uniqueItems": true
- },
- "qualitativePolicy": {
- "enum": [ "sameUserCountry" ]
}
}
}
@@ -317,12 +319,16 @@
},
{
"type": "object",
- "required": [ "quantitativeCost", "unit" ],
+ "required": [ "abstractValue", "value" ],
"properties": {
- "kind": {
- "const": "cost"
+ "type": {
+ "const": "Cost"
+ },
+ "abstractValue": {
+ "type": "string",
+ "enum": [ "Low", "Medium", "High" ]
},
- "quantitativeCost": {
+ "value": {
"type": "number",
"exclusiveMinimum": 0
},
@@ -335,11 +341,6 @@
},
"VirtualMachine": {
"type": "object",
- "required": [
- "id",
- "cspName",
- "cspId"
- ],
"properties": {
"id": {
"type": "string"
@@ -377,19 +378,13 @@
"Container": {
"type": "object",
"required": [
- "id",
- "name",
"imageName",
"imageTag",
"hostname",
"restart",
- "dockerHostNodeName",
- "consulKvProviderNodeName"
+ "dockerHostNodeName"
],
"properties": {
- "id": {
- "type": "string"
- },
"containerName": {
"type": "string"
},
@@ -412,8 +407,7 @@
]
},
"dockerPrivateRegistryPort": {
- "type": "integer",
- "minimum": 0
+ "type": "integer"
},
"dockerPrivateRegistryUser": {
"type": "string"
@@ -451,10 +445,7 @@
}
},
"volumeMapping": {
- "type": "object",
- "additionalProperties": {
- "type": "string"
- }
+ "type": "array"
},
"environment": {
"type": "array",
@@ -466,16 +457,24 @@
"type": "string"
},
"addConsulService": {
- "type": "boolean"
+ "type": "integer"
},
"addConsulTraefikRules": {
- "type": "boolean"
+ "type": "integer"
},
"portMapping": {
- "type": "object",
- "additionalProperties": {
- "type": "integer",
- "minimum": 0
+ "type": "array",
+ "items": {
+ "type": "object",
+ "required": [ "hostPort", "containerPort" ],
+ "properties": {
+ "hostPort": {
+ "type": "string"
+ },
+ "containerPort": {
+ "type": "string"
+ }
+ }
}
},
"endpoints": {
@@ -616,6 +615,16 @@
"comment": {
"type": "string"
},
+ "value": {
+ "type": "string"
+ },
+ "unit": {
+ "type": "string"
+ },
+ "conditionStatement": {
+ "type": "string",
+ "enum": [ "greater", "less", "greaterOrEqual", "lessOrEqual", "equal" ]
+ },
"violationTriggerRules": {
"type": "array",
"items": {
@@ -635,7 +644,7 @@
},
"Metric": {
"type": "object",
- "required": [ "id", "scale" ],
+ "required": [ "id", "scale", "expression" ],
"properties": {
"descriptor": {
"type": "string"
@@ -674,21 +683,14 @@
"underlyingMetrics": {
"type": "array",
"items": {
- "anyOf": [
- {
- "type": "string"
- },
- {
- "$ref": "#/definitions/Metric"
- }
- ]
+ "$ref": "#/definitions/Metric"
}
}
}
},
"Expression": {
"type": "object",
- "required": [ "id", "expression", "expressionLanguage" ],
+ "required": [ "expression", "expressionLanguage" ],
"properties": {
"id": {
"type": "string"
@@ -825,7 +827,7 @@
"minimum": 0
},
"skipRule": {
- "type": "boolean"
+ "type": "integer"
},
"containerNameOverride": {
"type": "string"
diff --git a/AppController/src/main/resources/optimus_history.schema.json b/AppController/src/main/resources/optimus_history.schema.json
index 57a15db8..a9ba6d9c 100644
--- a/AppController/src/main/resources/optimus_history.schema.json
+++ b/AppController/src/main/resources/optimus_history.schema.json
@@ -10,37 +10,39 @@
"definitions": {
"HistoryEntry": {
"type": "object",
- "required": [ "date", "deployments" ],
+ "required": [ "date", "schema" ],
"properties": {
"date": {
"type": "string",
"format": "date-time"
},
- "deployments": {
+ "schema": {
"type": "object",
- "additionalProperties": {
- "$ref": "#/definitions/HistoricalDeployment"
- },
- "minProperties": 1
- }
- }
- },
- "HistoricalDeployment": {
- "type": "object",
- "properties": {
- "deployedOn": {
- "type": "string"
+ "properties": {
+ "microservices": {
+ "type": "array",
+ "items": {
+ "type": "string",
+ "format": "uuid"
+ },
+ "minItems": 1,
+ "uniqueItems": true
+ },
+ "csId": {
+ "type": "string"
+ },
+ "index": {
+ "type": "number"
+ }
+ }
},
"slaBreaches": {
"type": "array",
"items": {
- "$ref": "#/definitions/SlaBreach"
+ "type": "object"
}
}
}
- },
- "SlaBreach": {
- "type": "object"
}
}
}
diff --git a/AppController/src/test/java/eu/DECIDEh2020/appManager/AppDescriptionFactoryTest.java b/AppController/src/test/java/eu/DECIDEh2020/appManager/AppDescriptionFactoryTest.java
index 43a735b1..88073d10 100644
--- a/AppController/src/test/java/eu/DECIDEh2020/appManager/AppDescriptionFactoryTest.java
+++ b/AppController/src/test/java/eu/DECIDEh2020/appManager/AppDescriptionFactoryTest.java
@@ -1,8 +1,23 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import eu.DECIDEh2020.appManager.exceptions.DECIDEValidationException;
import eu.DECIDEh2020.appManager.models.AppDescription;
+import org.everit.json.schema.ValidationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.Test;
@@ -18,11 +33,17 @@ public class AppDescriptionFactoryTest {
@Test
public void createAppDescription() {
AppDescription appDescription = AppDescriptionFactory.createAppDescription("TestApp");
+// appDescription.getMicroservices().get(0).setPublicIP(true);
+ try {
+ log.debug(new ObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(appDescription));
+ } catch (JsonProcessingException e) {
+ log.error("pretty print app description", e);
+ }
try {
AppDescriptionFactory.validateAppDescription(appDescription);
assert true;
} catch (DECIDEValidationException e) {
- log.error("reading and validating test resource", e);
+ log.error("validating test resource", ((ValidationException)e.getCause()).toJSON().toString(4));
assert false;
}
}
@@ -34,8 +55,11 @@ public class AppDescriptionFactoryTest {
AppDescription appDescription = new ObjectMapper().readValue(path.toFile(), AppDescription.class);
AppDescriptionFactory.validateAppDescription(appDescription);
assert true;
- } catch (DECIDEValidationException | IOException e) {
- log.error("reading and validating test resource", e);
+ } catch (DECIDEValidationException e) {
+ log.error("validating test resource", ((ValidationException)e.getCause()).toJSON().toString(4));
+ assert false;
+ } catch (IOException e) {
+ log.error("reading test resource", e);
assert false;
}
}
diff --git a/AppController/src/test/java/eu/DECIDEh2020/appManager/AppDescriptionHelperTest.java b/AppController/src/test/java/eu/DECIDEh2020/appManager/AppDescriptionHelperTest.java
index 34d7ead9..3ac1143c 100644
--- a/AppController/src/test/java/eu/DECIDEh2020/appManager/AppDescriptionHelperTest.java
+++ b/AppController/src/test/java/eu/DECIDEh2020/appManager/AppDescriptionHelperTest.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/AppController/src/test/java/eu/DECIDEh2020/appManager/AppManagerTest.java b/AppController/src/test/java/eu/DECIDEh2020/appManager/AppManagerTest.java
index ab928a65..bc660bca 100644
--- a/AppController/src/test/java/eu/DECIDEh2020/appManager/AppManagerTest.java
+++ b/AppController/src/test/java/eu/DECIDEh2020/appManager/AppManagerTest.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager;
import eu.DECIDEh2020.appManager.exceptions.AppManagerException;
@@ -56,4 +69,22 @@ public class AppManagerTest {
}
}
+ @Test
+ public void subfolderDescriptor() {
+ Path path = FileSystems.getDefault().getPath(LOCAL_REPO_PATH);
+ try {
+ AppManager manager = AppManager.open(path);
+ manager.setDescriptor("subfolder/DECIDE.json");
+ AppDescription app = manager.getAppDescription();
+ app.getAdditionalProperties().forEach((key, value) -> log.debug("{} - {}", key, value));
+ } catch (DECIDEValidationException e) {
+ log.error("validation", e);
+ } catch (AppManagerException e) {
+ log.error("open repository", e);
+ } catch (IOException e) {
+ log.error("getting app description", e);
+ assert false;
+ }
+ }
+
}
diff --git a/AppController/src/test/java/eu/DECIDEh2020/appManager/HistoryFactoryTest.java b/AppController/src/test/java/eu/DECIDEh2020/appManager/HistoryFactoryTest.java
index b5d7cada..bd8077d4 100644
--- a/AppController/src/test/java/eu/DECIDEh2020/appManager/HistoryFactoryTest.java
+++ b/AppController/src/test/java/eu/DECIDEh2020/appManager/HistoryFactoryTest.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/AppController/src/test/java/eu/DECIDEh2020/appManager/HistoryManagerTest.java b/AppController/src/test/java/eu/DECIDEh2020/appManager/HistoryManagerTest.java
index 23ca3ace..17b5dcdb 100644
--- a/AppController/src/test/java/eu/DECIDEh2020/appManager/HistoryManagerTest.java
+++ b/AppController/src/test/java/eu/DECIDEh2020/appManager/HistoryManagerTest.java
@@ -1,4 +1,25 @@
+/*
+ * Copyright (c) 2017 Fraunhofer FOKUS.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the
+ * GNU AGPL v3 which accompanies
+ * this distribution, and is available at
+ * http://www.gnu.org/licenses/agpl.txt
+ *
+ * Contributors:
+ * Simon Dutkowski Fraunhofer FOKUS
+ *
+ * Initially developed in the context of DECIDE EU project www.DECIDE-h2020.eu
+ */
package eu.DECIDEh2020.appManager;
+import org.testng.annotations.Test;
+
public class HistoryManagerTest {
+
+ @Test
+ public void useHistoryManage() {
+
+ }
+
}
diff --git a/AppController/src/test/resources/DECIDE.json b/AppController/src/test/resources/DECIDE.json
index d43fa36f..11593efd 100644
--- a/AppController/src/test/resources/DECIDE.json
+++ b/AppController/src/test/resources/DECIDE.json
@@ -40,28 +40,31 @@
],
"nfrs": [
{
- "kind": "availability",
+ "type": "Availability",
"tags": [ "application" ],
- "quantitativeAvailability": "99.8",
+ "abstractValue": "Medium",
+ "value": 99.8,
"unit": "percentage"
},
{
- "kind": "performance",
+ "type": "Performance",
"tags": [ "application" ],
- "quantitativeResponseTime": 300,
+ "abstractValue": "Medium",
+ "value": 300,
"unit": "millisecond"
},
{
- "kind": "location",
+ "type": "Location",
"tags": [ "application" ],
- "qualitativeRegions": [ "europe" ],
- "qualitativeCountries": [ "italy" ],
- "qualitativePolicy": "sameUserCountry"
+ "abstractValue": "Single Country",
+ "value": [ "Italy", "Germany" ]
},
{
- "kind": "scalability",
+ "type": "Scalability",
"tags": [ "backend-services" ],
- "scaleBy": [ "messageCount", "processorLoad" ]
+ "abstractValue": "High",
+ "value": 2000,
+ "unit": "requests/second"
}
],
"recommendedPatterns": [
@@ -113,7 +116,7 @@
"id": "35de5140-7e26-4ce1-a343-b5ce8ef87442",
"comment": "Uptime will not be less then 97% of the time",
"termName": "Availability Uptime",
- "value": 97,
+ "value": "97",
"unit": "percentage",
"metrics": [
{
@@ -141,7 +144,7 @@
"id": "35de5140-7e26-4ce1-a343-b5ce8ef87442",
"comment": "Uptime will not be less then 97% of the time over a day",
"termName": "Availability MTBF",
- "value": 97,
+ "value": "97",
"unit": "second",
"metrics": [
{
@@ -186,7 +189,7 @@
"comment": "CPU utilization will not be less then 95% of the time over a day",
"termName": "CPU-utilization-SQO",
"monitoringResult": "result",
- "value": 95,
+ "value": "95",
"unit": "percentage",
"calculationFormula": "CPU-utilization LT 95",
"violationTriggerRules": [
@@ -205,7 +208,11 @@
{
"id": "CSA_002",
"descriptor": "CloudServiceAvailability",
- "scale": "nominal"
+ "scale": "nominal",
+ "expression": {
+ "expression": "EMPTY",
+ "expressionLanguage": "iso8000"
+ }
}
]
},
@@ -214,7 +221,7 @@
"comment": "CPU utilization will not be less then 95% of the time over a day",
"termName": "CPU-utilization-SLO",
"monitoringResult": "result",
- "value": 95,
+ "value": "95",
"unit": "percentage",
"calculationFormula": "CPU-utilization LT 95",
"violationTriggerRules": [
@@ -235,7 +242,7 @@
"comment": "Uptime will not be less then 97% of the time over a day",
"termName": "Aggregated-Uptime-SLO",
"monitoringResult": "result",
- "value": 97,
+ "value": "97",
"unit": "percentage",
"calculationFormula": "Uptime GT 97",
"violationTriggerRules": [
@@ -259,5 +266,5 @@
],
"virtualMachines": [
],
- "appInstanceId": "???"
+ "applicationInstanceId": "???"
}
--
GitLab