Move Container to Winery Model for Tosca interactions by Vogel612 · Pull Request #78 · OpenTOSCA/container

Vogel612 · 2018-08-22T17:34:49Z

Short Description

This change drops the duplication of the Tosca-Model by the container and instead directly uses the model exposed by the winery. It additionally changes the representation of CSARs used by the container. Instead of a self-rolled half-unpacked representation that necessitates resolving any contents of the CSAR through XML-Queries, a Csar is now encapsulated into a standalone winery IRepository that exposes query methods acting on the aforementioned winery model.

Additionally this PullRequest completely removes OSGI and all references to it from the codebase. Dependency Injection is instead performed through Spring using the standard javax.inject.@Inject annotation. The Event system of OSGI (which was only used for communication with the management bus) has been replaced with a direct invocation against a java bean.
There is no longer any way to add plugins to the container at runtime, but plugins on the classpath during startup that are correctly registered as spring-beans will be discovered and used.

Current Status / Functionality

The core functionality for Csars is working with the current changes. This notably includes uploading (including plan-generation), deployment and termination verified for MyTinyToDo_Bare_Docker and HomeAssistant_Bare_Docker.

A variety of different issues around other functionalities remains present. Most notably the following functionalities are broken at time of writing:

Soft-Deletion for all persistence objects
SituationTriggerListener functionality around invoking plans (because we can't easily inject service components into the listener instance)
SituationAdaption (cf. SituationListener#sendServiceInstanceAdaptionEvent)
Remaining functionalities using IToscaReferenceMapper, notably consolidation, as well as Resolver implementations and the call pattern determination in PlanInvocationEngine

Next Steps

The next steps revolve around replacing the last usages of IToscaReferenceMapper, which is functionally broken as well as getting to parity of functionality with the mainline to enable merging this massive set of changes

This removes the disused legacy api. It preempts this change from the pull-request that moves the tosca model to the winery provisioned model and thus eliminates a source of conflicts for #78. That way it also removes over a quarter of the current deletions from the diff.

…tional bundle

This is intended to fix the ClassNotFound issues around commons-configuration2. As of this commit, it introduces an issue with serialization, though.

This also adjusts the project structures to follow the default maven conventions of using src/main/java as root folder for all java files.

…builder pending it's migration to winery model

This sidesteps the issue of the unwrapping process being specific to the persistence-provider, formerly eclipselink, now h2 / hibernate.

fix logging of api errors

This reverts commit a746436.

…merges # Conflicts: # .gitignore # org.opentosca.bus.management.service.impl/src/org/opentosca/bus/management/service/impl/ManagementBusServiceImpl.java # org.opentosca.container.api/OSGI-INF/ServiceTemplateController.xml # org.opentosca.container.api/src/org/opentosca/container/api/controller/CsarController.java # org.opentosca.container.api/src/org/opentosca/container/api/controller/RootController.java # org.opentosca.container.api/src/org/opentosca/container/api/controller/ServiceTemplateController.java # org.opentosca.container.api/src/org/opentosca/container/api/controller/ServiceTemplateInstanceController.java # org.opentosca.container.api/src/org/opentosca/container/api/controller/SituationsController.java # org.opentosca.container.api/src/org/opentosca/container/api/dto/plan/PlanDTO.java # org.opentosca.container.api/src/org/opentosca/container/api/dto/plan/PlanInstanceEventDTO.java # org.opentosca.container.api/src/org/opentosca/container/api/dto/situations/SituationTriggerDTO.java # org.opentosca.container.api/src/org/opentosca/container/api/service/CsarService.java # org.opentosca.container.api/src/org/opentosca/container/api/service/InstanceService.java # org.opentosca.container.api/src/org/opentosca/container/api/service/PlanService.java # org.opentosca.container.core.impl/src/org/opentosca/container/core/impl/plan/PlanInvocationEngine.java # org.opentosca.container.core.tosca/src/org/opentosca/container/core/tosca/convention/Interfaces.java # org.opentosca.container.core.tosca/src/org/opentosca/container/core/tosca/convention/Types.java # org.opentosca.container.core.tosca/src/org/opentosca/container/core/tosca/convention/Utils.java # org.opentosca.container.core.tosca/src/org/opentosca/container/core/tosca/extension/PlanInvocationEvent.java # org.opentosca.container.core.tosca/src/org/opentosca/container/core/tosca/extension/TParameter.java # org.opentosca.container.core.tosca/src/org/opentosca/container/core/tosca/extension/TPlanDTO.java # org.opentosca.container.core.tosca/src/org/opentosca/container/core/tosca/model/TParameter.java # org.opentosca.container.core.tosca/src/org/opentosca/container/core/tosca/model/TPlan.java # org.opentosca.container.core/src/org/opentosca/container/core/next/model/PlanInstance.java # org.opentosca.container.core/src/org/opentosca/container/core/next/model/PlanInstanceEvent.java # org.opentosca.container.core/src/org/opentosca/container/core/next/model/SituationTrigger.java # org.opentosca.container.core/src/org/opentosca/container/core/next/repository/PlanInstanceRepository.java # org.opentosca.container.core/src/org/opentosca/container/core/next/trigger/SituationTriggerInstanceListener.java # org.opentosca.container.engine.plan.plugin.bpel/META-INF/MANIFEST.MF # org.opentosca.container.engine.plan.plugin.bpel/src/org/opentosca/container/engine/plan/plugin/bpel/BpelPlanEnginePlugin.java # org.opentosca.container.feature/feature.xml # org.opentosca.container.product/org.opentosca.container.product # org.opentosca.planbuilder.core.bpel/src/main/resources/core-bpel/BPELWaitTillTrue.xml # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/artifactbasednodehandler/InterfaceDummy.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/artifactbasednodehandler/OperationChain.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/context/BPELPlanContext.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/fragments/BPELProcessFragments.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/handlers/BPELFinalizer.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/handlers/BPELPlanHandler.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/handlers/BPELScopeHandler.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/tosca/handlers/NodeRelationInstanceVariablesHandler.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/typebasednodehandler/BPELPluginHandler.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/typebasedplanbuilder/BPELBackupManagementProcessBuilder.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/typebasedplanbuilder/BPELBuildProcessBuilder.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/typebasedplanbuilder/BPELDefrostProcessBuilder.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/typebasedplanbuilder/BPELFreezeProcessBuilder.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/typebasedplanbuilder/BPELPolicyAwareBuildProcessBuilder.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/typebasedplanbuilder/BPELScaleOutProcessBuilder.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/typebasedplanbuilder/BPELTestManagementProcessBuilder.java # org.opentosca.planbuilder.core.bpel/src/org/opentosca/planbuilder/core/bpel/typebasedplanbuilder/BPELTransformationProcessBuilder.java # org.opentosca.planbuilder.integration/src/org/opentosca/planbuilder/export/Exporter.java # org.opentosca.planbuilder.integration/src/org/opentosca/planbuilder/importer/context/impl/InterfaceImpl.java # org.opentosca.planbuilder.integration/src/org/opentosca/planbuilder/importer/context/impl/OperationImpl.java # org.opentosca.planbuilder.model/src/org/opentosca/planbuilder/model/plan/bpel/BPELScope.java # org.opentosca.planbuilder.model/src/org/opentosca/planbuilder/model/tosca/AbstractDefinitions.java # org.opentosca.planbuilder.model/src/org/opentosca/planbuilder/model/tosca/AbstractNodeType.java # org.opentosca.planbuilder.model/src/org/opentosca/planbuilder/model/tosca/AbstractOperation.java # org.opentosca.planbuilder.model/src/org/opentosca/planbuilder/model/tosca/AbstractRelationshipTemplate.java # org.opentosca.planbuilder.postphase.plugin.instancedata/src/org/opentosca/planbuilder/postphase/plugin/instancedata/bpel/BPELInstanceDataPlugin.java # org.opentosca.planbuilder.postphase.plugin.instancedata/src/org/opentosca/planbuilder/postphase/plugin/instancedata/bpel/Handler.java # org.opentosca.planbuilder.postphase.plugin.monitoring/src/org/opentosca/planbuilder/postphase/plugin/monitoring/bpel/impl/BPELMonitoringPlugin.java # org.opentosca.planbuilder.postphase.plugin.vinothek/src/org/opentosca/planbuilder/postphase/plugin/vinothek/bpel/BPELVinothekPlugin.java # org.opentosca.planbuilder.postphase.plugin.vinothek/src/org/opentosca/planbuilder/postphase/plugin/vinothek/core/VinothekPlugin.java # org.opentosca.planbuilder.provphase.plugin.invoker/src/org/opentosca/planbuilder/provphase/plugin/invoker/bpel/BPELInvokerPlugin.java # org.opentosca.planbuilder.provphase.plugin.invoker/src/org/opentosca/planbuilder/provphase/plugin/invoker/bpel/handlers/BPELInvokerPluginHandler.java # org.opentosca.planbuilder.provphase.plugin.invoker/src/org/opentosca/planbuilder/provphase/plugin/invoker/bpel/handlers/ResourceHandler.java # org.opentosca.planbuilder.service/META-INF/MANIFEST.MF # org.opentosca.planbuilder.service/src/org/opentosca/planbuilder/service/resources/RootResource.java # org.opentosca.planbuilder.type.plugin.dockercontainer/src/org/opentosca/planbuilder/type/plugin/dockercontainer/bpel/BPELDockerContainerTypePlugin.java # org.opentosca.planbuilder.type.plugin.dockercontainer/src/org/opentosca/planbuilder/type/plugin/dockercontainer/bpel/handler/BPELDockerContainerTypePluginHandler.java # org.opentosca.planbuilder.type.plugin.hardware/src/org/opentosca/planbuilder/type/plugin/hardware/HardwarePlugin.java # org.opentosca.planbuilder.type.plugin.patternbased/src/org/opentosca/planbuilder/type/plugin/patternbased/bpel/ContainerPatternBasedHandler.java # org.opentosca.planbuilder.type.plugin.patternbased/src/org/opentosca/planbuilder/type/plugin/patternbased/bpel/LifecyclePatternBasedHandler.java # org.opentosca.planbuilder.type.plugin.patternbased/src/org/opentosca/planbuilder/type/plugin/patternbased/bpel/PatternBasedPlugin.java # org.opentosca.planbuilder/src/org/opentosca/planbuilder/AbstractTransformingPlanbuilder.java # org.opentosca.planbuilder/src/org/opentosca/planbuilder/plugins/typebased/IPlanBuilderPostPhasePlugin.java Signed-off-by: Kálmán Képes <kalman.kepes@iaas.uni-stuttgart.de>

# Conflicts: # org.opentosca.container.war/pom.xml Signed-off-by: Kálmán Képes <kalman.kepes@iaas.uni-stuttgart.de>

Signed-off-by: Kálmán Képes <kalman.kepes@iaas.uni-stuttgart.de>

Vogel612 added the in progress label Aug 22, 2018

Vogel612 requested a review from miwurster August 22, 2018 17:34

Vogel612 mentioned this pull request Aug 29, 2018

Handling of Relationship Type Implementations #81

Merged

Vogel612 added the needs review label Aug 30, 2018

Vogel612 mentioned this pull request Nov 20, 2018

Add accountability to osgi feature winery/winery#382

Merged

Vogel612 force-pushed the feature/winery-model branch from b9d7ce2 to 8be4fcf Compare December 21, 2018 11:42

Remove IAEngine from ControlService to enable use of container api

b3014cb

Vogel612 mentioned this pull request Jan 25, 2019

Remove legacy api #91

Merged

miwurster and others added 7 commits January 29, 2019 13:42

Merge remote-tracking branch 'origin/master' into feature/winery-model

b4d0860

Fix product build

1d4e1da

Running product

5674b0c

Remove xerces from feature

bb76e69

Correctly configure org.eclipse.jdt.annotation dependency to be an op…

f46ddc0

…tional bundle

Depend on manually packaged and declared winery binaries

7592715

This is intended to fix the ClassNotFound issues around commons-configuration2. As of this commit, it introduces an issue with serialization, though.

Fix target platform issues

946a92e

Vogel612 force-pushed the feature/winery-model branch from ea0c963 to 946a92e Compare February 8, 2019 18:35

Vogel612 added 5 commits February 8, 2019 20:52

Resolve LinkageErrors caused by conflicting javax.xml versions

9babcec

Move dependency handling from OSGI target to maven

5ae024e

This also adjusts the project structures to follow the default maven conventions of using src/main/java as root folder for all java files.

Fix remaining compilation problems and start deploying api to tomcat

9bc8889

remove temporary conflict resolution file from tree

9285c75

More compilation fixes, deployment to Tomcat

2d47640

Vogel612 force-pushed the feature/winery-model branch from 75164fb to 2d47640 Compare February 26, 2019 16:53

Vogel612 added 7 commits February 28, 2019 14:12

Set up JAXB and pull in Spring DI

f202481

Scan for Services to inject and set up hibernate

90e53ad

Fix issues with hibernate start

bed3abd

Integrate RESTeasy and Spring DI

af7fd32

Fix Service dependency discovery for Csar upload and comment out Plan…

d21131a

…builder pending it's migration to winery model

Rewrite CapabilityService to not unwrap EntityManager

4f12b68

This sidesteps the issue of the unwrapping process being specific to the persistence-provider, formerly eclipselink, now h2 / hibernate.

Introduce and enforce checkstyle.xml from winery

5212ac4

lharzenetter and others added 5 commits June 16, 2020 15:01

reformat all code

a746436

fix application.properties

acadca0

fix logging of api errors

Remove outdated docker config files

b1c8545

Revert "reformat all code"

200c303

This reverts commit a746436.

Reformat code

09899f5

wederbn force-pushed the feature/winery-model branch from 0421630 to 09899f5 Compare June 16, 2020 14:11

wederbn and others added 17 commits June 16, 2020 16:13

Format planbuilder code

c96e88b

Filter management plan instances by name

52aa1ac

Remoove unused files

7459d18

merge #136 #125 #137 #135 #140

1bb81e4

WIP Dockerfile

c9f12bd

Add server-xml.tpl for Dockerfile

a055062

Add missing file

e856e05

Merge branch 'feature/mothermerge' into feature/winery-model

d71c3a0

# Conflicts: # org.opentosca.container.war/pom.xml Signed-off-by: Kálmán Képes <kalman.kepes@iaas.uni-stuttgart.de>

fix kalles scheiss

82fa710

fixes issue with plans not properly setting their own state

ff448f5

Signed-off-by: Kálmán Képes <kalman.kepes@iaas.uni-stuttgart.de>

update readme

c289cd3

Update application.properties

8f20e51

Update application.properties

2f07c98

Readme

1f75834

update dependecies

983f124

update winery dependencies

9a2710d

wederbn removed the in progress label Jun 18, 2020

iaas and others added 3 commits June 18, 2020 15:50

moves planbuilder modules into its submodule structure

1292391

code format

55b0403

Merge branch 'master' into feature/winery-model

867d6ec

lharzenetter removed the needs review label Jun 18, 2020

lharzenetter merged commit b29cb6c into master Jun 18, 2020

lharzenetter deleted the feature/winery-model branch June 18, 2020 14:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move Container to Winery Model for Tosca interactions#78

Move Container to Winery Model for Tosca interactions#78
lharzenetter merged 390 commits intomasterfrom
feature/winery-model

Vogel612 commented Aug 22, 2018 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

5 participants

Conversation

Vogel612 commented Aug 22, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Short Description

Current Status / Functionality

Next Steps

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

5 participants

Vogel612 commented Aug 22, 2018 •

edited

Loading