diff options
| author |   Michael Dürre <michael.duerre@highstreet-technologies.com> | 2019-08-02 06:45:49 +0200 |
|---|---|---|
| committer |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-08-09 08:21:40 -0400 |
| commit | b4fce004a40753e396f100ac9abdbe876de5865e (patch) | |
| tree | 88daa991a9aada177c8356c81b32aa9323ecb750 | |
| parent | f60b704c23ffb6df5ceb3b6d5b43729a5434f375 (diff) | |
fixed mediator app
route requests through apigateway
Issue-ID: SDNC-824
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: Ief159a71888f271a7751884260f85be01efdd6b4
92 files changed, 411 insertions, 170 deletions
diff --git a/aafshiro/features/ccsdk-aafshiro/pom.xml b/aafshiro/features/ccsdk-aafshiro/pom.xml index 39b0b3e3c..1b663e867 100755 --- a/aafshiro/features/ccsdk-aafshiro/pom.xml +++ b/aafshiro/features/ccsdk-aafshiro/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features</groupId> <artifactId>ccsdk-aafshiro</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features :: aafshiro :: ${project.artifactId}</name> diff --git a/aafshiro/features/features-aafshiro/pom.xml b/aafshiro/features/features-aafshiro/pom.xml index a6e384dd0..b408d1342 100755 --- a/aafshiro/features/features-aafshiro/pom.xml +++ b/aafshiro/features/features-aafshiro/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features</groupId> <artifactId>features-aafshiro</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features :: aafshiro :: ${project.artifactId}</name> diff --git a/aafshiro/features/pom.xml b/aafshiro/features/pom.xml index 1885e119c..709b1fa86 100755 --- a/aafshiro/features/pom.xml +++ b/aafshiro/features/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features</groupId> <artifactId>aafshiro-features</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features :: aafshiro :: ${project.artifactId}</name> diff --git a/aafshiro/installer/pom.xml b/aafshiro/installer/pom.xml index 5efea85cc..b4db1571d 100755 --- a/aafshiro/installer/pom.xml +++ b/aafshiro/installer/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features</groupId> <artifactId>aafshiro-installer</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features :: aafshiro :: ${project.artifactId}</name> diff --git a/aafshiro/pom.xml b/aafshiro/pom.xml index 96788b816..181339d40 100755 --- a/aafshiro/pom.xml +++ b/aafshiro/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features</groupId> <artifactId>aafshiro</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features :: aafshiro</name> diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml index 21773fa28..7b7742b66 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml @@ -18,7 +18,7 @@ </parent> <groupId>org.onap.ccsdk.features</groupId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <artifactId>blueprints-data-adaptor-provider</artifactId> <packaging>bundle</packaging> <name>Blueprints Data Adaptor - Provider</name> diff --git a/blueprints-processor/adaptors/pom.xml b/blueprints-processor/adaptors/pom.xml index 92109a9b3..506264d6f 100644 --- a/blueprints-processor/adaptors/pom.xml +++ b/blueprints-processor/adaptors/pom.xml @@ -25,7 +25,7 @@ </parent> <groupId>org.onap.ccsdk.features</groupId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <artifactId>blueprints-processor-adaptors</artifactId> diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml index b5b780623..81f6341af 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.onap.ccsdk.features</groupId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <artifactId>blueprints-rest-adaptor-provider</artifactId> <packaging>bundle</packaging> <name>Blueprints Rest Adaptor - Provider</name> diff --git a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml index 2d5ee44c3..5c4d41dc1 100644 --- a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml +++ b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features</groupId> <artifactId>ccsdk-blueprints-processor</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>Blueprints Processor :: Features :: ${project.artifactId}</name> diff --git a/blueprints-processor/features/features-blueprints-processor/pom.xml b/blueprints-processor/features/features-blueprints-processor/pom.xml index b039c20f8..268848a29 100755 --- a/blueprints-processor/features/features-blueprints-processor/pom.xml +++ b/blueprints-processor/features/features-blueprints-processor/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features</groupId> <artifactId>features-blueprints-processor</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>Blueprints Processor :: CCSDK Features :: ${project.artifactId}</name> diff --git a/blueprints-processor/features/pom.xml b/blueprints-processor/features/pom.xml index 0713cf3d0..b73c2f7d0 100755 --- a/blueprints-processor/features/pom.xml +++ b/blueprints-processor/features/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features</groupId> <artifactId>blueprints-processor-features</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Blueprints Processor :: Features aggregator :: ${project.artifactId}</name> diff --git a/blueprints-processor/installer/pom.xml b/blueprints-processor/installer/pom.xml index 0094e1e08..85064a6f4 100644 --- a/blueprints-processor/installer/pom.xml +++ b/blueprints-processor/installer/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features</groupId> <artifactId>blueprints-processor-installer</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Blueprints Processor :: ${project.artifactId}</name> diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml index 22f763833..ea534cf75 100644 --- a/blueprints-processor/plugin/assignment-provider/pom.xml +++ b/blueprints-processor/plugin/assignment-provider/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.onap.ccsdk.features</groupId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <artifactId>blueprints-assignment-provider</artifactId> <packaging>bundle</packaging> <name>Blueprints Assignment - Provider</name> diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml index 249f264fc..6c259ee26 100644 --- a/blueprints-processor/plugin/generator-provider/pom.xml +++ b/blueprints-processor/plugin/generator-provider/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.onap.ccsdk.features</groupId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <artifactId>blueprints-generator-provider</artifactId> <packaging>bundle</packaging> <name>Blueprints Generator - Provider</name> diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml index 7ed6d22bc..8e5c922a8 100644 --- a/blueprints-processor/plugin/model-provider/pom.xml +++ b/blueprints-processor/plugin/model-provider/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.onap.ccsdk.features</groupId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <artifactId>blueprints-model-provider</artifactId> <packaging>bundle</packaging> <name>Blueprints Model - Provider</name> diff --git a/blueprints-processor/plugin/pom.xml b/blueprints-processor/plugin/pom.xml index 06904da63..49bdd986f 100644 --- a/blueprints-processor/plugin/pom.xml +++ b/blueprints-processor/plugin/pom.xml @@ -25,7 +25,7 @@ <relativePath/> </parent> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <artifactId>blueprints-processor-plugin</artifactId> <groupId>org.onap.ccsdk.features</groupId> <packaging>pom</packaging> diff --git a/blueprints-processor/pom.xml b/blueprints-processor/pom.xml index 483d10b63..4cde2df72 100644 --- a/blueprints-processor/pom.xml +++ b/blueprints-processor/pom.xml @@ -27,7 +27,7 @@ <groupId>org.onap.ccsdk.features</groupId> <artifactId>blueprints-processor</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Blueprints Processor Module</name> diff --git a/features/ccsdk-features-all/pom.xml b/features/ccsdk-features-all/pom.xml index 80e418bcd..f7be5a207 100644 --- a/features/ccsdk-features-all/pom.xml +++ b/features/ccsdk-features-all/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features</groupId> <artifactId>ccsdk-features-all</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features :: features :: ${project.artifactId}</name> diff --git a/features/features-features/pom.xml b/features/features-features/pom.xml index 74c72b88b..e370c4491 100644 --- a/features/features-features/pom.xml +++ b/features/features-features/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features</groupId> <artifactId>features-features</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>Blueprints Processor :: features :: ${project.artifactId}</name> diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 433a218bb..e96787781 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features</groupId> <artifactId>features-installer</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Blueprints Processor :: features :: ${project.artifactId}</name> diff --git a/features/pom.xml b/features/pom.xml index 9d9da4812..d50c0e22f 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features</groupId> <artifactId>ccsdk-feature-aggregator</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Blueprints Processor :: features</name> @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.features</groupId> <artifactId>ccsdk-features</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features</name> diff --git a/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml b/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml index 553ade7f2..1e25dde45 100644 --- a/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml +++ b/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>sdnr-northbound-all</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-northbound :: features :: ${project.artifactId}</name> diff --git a/sdnr/northbound/features/installer/pom.xml b/sdnr/northbound/features/installer/pom.xml index 46cadd59b..c6e2b93ae 100644 --- a/sdnr/northbound/features/installer/pom.xml +++ b/sdnr/northbound/features/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>sdnr-northbound-features-installer</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-northbound :: features :: ${project.artifactId}</name> diff --git a/sdnr/northbound/features/pom.xml b/sdnr/northbound/features/pom.xml index 77f6e4630..3b5261569 100644 --- a/sdnr/northbound/features/pom.xml +++ b/sdnr/northbound/features/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>sdnr-northbound-feature-aggregator</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-northbound :: features</name> diff --git a/sdnr/northbound/oofpcipoc/consumer/pom.xml b/sdnr/northbound/oofpcipoc/consumer/pom.xml index 0cb5bf5de..0e7294c7c 100644 --- a/sdnr/northbound/oofpcipoc/consumer/pom.xml +++ b/sdnr/northbound/oofpcipoc/consumer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>oofpcipoc-consumer</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/sdnr/northbound/oofpcipoc/feature/pom.xml b/sdnr/northbound/oofpcipoc/feature/pom.xml index 2af7ddf95..bdb271691 100644 --- a/sdnr/northbound/oofpcipoc/feature/pom.xml +++ b/sdnr/northbound/oofpcipoc/feature/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>sdnr-oofpcipoc</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-northbound :: oofpcipoc :: ${project.artifactId}</name> diff --git a/sdnr/northbound/oofpcipoc/installer/pom.xml b/sdnr/northbound/oofpcipoc/installer/pom.xml index eeb0d6e2f..3d7894147 100644 --- a/sdnr/northbound/oofpcipoc/installer/pom.xml +++ b/sdnr/northbound/oofpcipoc/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>oofpcipoc-installer</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-northbound :: oofpcipoc :: ${project.artifactId}</name> diff --git a/sdnr/northbound/oofpcipoc/model/pom.xml b/sdnr/northbound/oofpcipoc/model/pom.xml index 9b61cb494..02edcc594 100644 --- a/sdnr/northbound/oofpcipoc/model/pom.xml +++ b/sdnr/northbound/oofpcipoc/model/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>oofpcipoc-model</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/sdnr/northbound/oofpcipoc/pom.xml b/sdnr/northbound/oofpcipoc/pom.xml index a7834bd8a..de71154fc 100644 --- a/sdnr/northbound/oofpcipoc/pom.xml +++ b/sdnr/northbound/oofpcipoc/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>oofpcipoc</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-northbound :: oofpcipoc</name> diff --git a/sdnr/northbound/oofpcipoc/provider/pom.xml b/sdnr/northbound/oofpcipoc/provider/pom.xml index 3cea74b25..ba07eb644 100644 --- a/sdnr/northbound/oofpcipoc/provider/pom.xml +++ b/sdnr/northbound/oofpcipoc/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>oofpcipoc-provider</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/sdnr/northbound/pom.xml b/sdnr/northbound/pom.xml index 6e9481dbf..80063a0f3 100644 --- a/sdnr/northbound/pom.xml +++ b/sdnr/northbound/pom.xml @@ -30,7 +30,7 @@ <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>sdnr-northbound</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sdnr-northbound :: features</name> <description>SDN-R RAN and OOF PCI ANR POC </description> diff --git a/sdnr/wt/apigateway/feature/pom.xml b/sdnr/wt/apigateway/feature/pom.xml index 2e118df32..4b4419cbe 100644 --- a/sdnr/wt/apigateway/feature/pom.xml +++ b/sdnr/wt/apigateway/feature/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-apigateway-feature</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name> diff --git a/sdnr/wt/apigateway/installer/pom.xml b/sdnr/wt/apigateway/installer/pom.xml index fe240e02a..bbe02d475 100755 --- a/sdnr/wt/apigateway/installer/pom.xml +++ b/sdnr/wt/apigateway/installer/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-apigateway-installer</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/apigateway/pom.xml b/sdnr/wt/apigateway/pom.xml index 939623f63..74f9b29c4 100755 --- a/sdnr/wt/apigateway/pom.xml +++ b/sdnr/wt/apigateway/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-apigateway-top</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/apigateway/provider/pom.xml b/sdnr/wt/apigateway/provider/pom.xml index cafd3187d..646311bff 100644 --- a/sdnr/wt/apigateway/provider/pom.xml +++ b/sdnr/wt/apigateway/provider/pom.xml @@ -17,7 +17,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-apigateway-provider</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> <properties> diff --git a/sdnr/wt/devicemanager/feature/pom.xml b/sdnr/wt/devicemanager/feature/pom.xml index cc61ed8e8..68929d156 100644 --- a/sdnr/wt/devicemanager/feature/pom.xml +++ b/sdnr/wt/devicemanager/feature/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemanager-feature</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name> diff --git a/sdnr/wt/devicemanager/installer/pom.xml b/sdnr/wt/devicemanager/installer/pom.xml index aea9461c1..b4d6b8ce7 100755 --- a/sdnr/wt/devicemanager/installer/pom.xml +++ b/sdnr/wt/devicemanager/installer/pom.xml @@ -33,7 +33,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemanager-installer</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/devicemanager/model/pom.xml b/sdnr/wt/devicemanager/model/pom.xml index 14001060f..faeee5d82 100644 --- a/sdnr/wt/devicemanager/model/pom.xml +++ b/sdnr/wt/devicemanager/model/pom.xml @@ -25,7 +25,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemanager-model</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> diff --git a/sdnr/wt/devicemanager/pom.xml b/sdnr/wt/devicemanager/pom.xml index 26d3e7e82..c19800c71 100755 --- a/sdnr/wt/devicemanager/pom.xml +++ b/sdnr/wt/devicemanager/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemanager-top</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/devicemanager/provider/pom.xml b/sdnr/wt/devicemanager/provider/pom.xml index f08fd47b2..483851479 100644 --- a/sdnr/wt/devicemanager/provider/pom.xml +++ b/sdnr/wt/devicemanager/provider/pom.xml @@ -20,7 +20,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemanager-provider</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> diff --git a/sdnr/wt/devicemodel/feature/pom.xml b/sdnr/wt/devicemodel/feature/pom.xml index f50852afc..72b50bf9e 100644 --- a/sdnr/wt/devicemodel/feature/pom.xml +++ b/sdnr/wt/devicemodel/feature/pom.xml @@ -24,7 +24,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemodel-feature</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name> diff --git a/sdnr/wt/devicemodel/installer/pom.xml b/sdnr/wt/devicemodel/installer/pom.xml index aea6cb143..c223aa780 100755 --- a/sdnr/wt/devicemodel/installer/pom.xml +++ b/sdnr/wt/devicemodel/installer/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemodel-installer</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/devicemodel/model/pom.xml b/sdnr/wt/devicemodel/model/pom.xml index 5195cf50d..78d552de4 100644 --- a/sdnr/wt/devicemodel/model/pom.xml +++ b/sdnr/wt/devicemodel/model/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemodel-model</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> diff --git a/sdnr/wt/devicemodel/pom.xml b/sdnr/wt/devicemodel/pom.xml index 903ce4057..ac90ed3d5 100755 --- a/sdnr/wt/devicemodel/pom.xml +++ b/sdnr/wt/devicemodel/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemodel-top</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/featureaggregator/feature/pom.xml b/sdnr/wt/featureaggregator/feature/pom.xml index 5db6a349a..fac6c46d0 100644 --- a/sdnr/wt/featureaggregator/feature/pom.xml +++ b/sdnr/wt/featureaggregator/feature/pom.xml @@ -24,7 +24,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-feature-aggregator</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml index 2415cf6ea..99e7f1f25 100755 --- a/sdnr/wt/featureaggregator/installer/pom.xml +++ b/sdnr/wt/featureaggregator/installer/pom.xml @@ -24,7 +24,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-feature-aggregator-installer</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/featureaggregator/pom.xml b/sdnr/wt/featureaggregator/pom.xml index 334df45fa..39074aa82 100755 --- a/sdnr/wt/featureaggregator/pom.xml +++ b/sdnr/wt/featureaggregator/pom.xml @@ -24,7 +24,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-feature-aggregator-top</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/helpserver/feature/pom.xml b/sdnr/wt/helpserver/feature/pom.xml index 5c793236f..6d103dfcd 100644 --- a/sdnr/wt/helpserver/feature/pom.xml +++ b/sdnr/wt/helpserver/feature/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-helpserver-feature</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name> diff --git a/sdnr/wt/helpserver/installer/pom.xml b/sdnr/wt/helpserver/installer/pom.xml index 3f0439522..1dd76b4fa 100755 --- a/sdnr/wt/helpserver/installer/pom.xml +++ b/sdnr/wt/helpserver/installer/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-helpserver-installer</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/helpserver/pom.xml b/sdnr/wt/helpserver/pom.xml index bb7094ff6..1f62a3991 100755 --- a/sdnr/wt/helpserver/pom.xml +++ b/sdnr/wt/helpserver/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-helpserver-top</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/helpserver/provider/pom.xml b/sdnr/wt/helpserver/provider/pom.xml index 3113537f3..c449b94c5 100644 --- a/sdnr/wt/helpserver/provider/pom.xml +++ b/sdnr/wt/helpserver/provider/pom.xml @@ -17,7 +17,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-helpserver-provider</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> <properties> diff --git a/sdnr/wt/odlux/apps/apiDemo/pom.xml b/sdnr/wt/odlux/apps/apiDemo/pom.xml index a3c8a708e..5afca3d83 100644 --- a/sdnr/wt/odlux/apps/apiDemo/pom.xml +++ b/sdnr/wt/odlux/apps/apiDemo/pom.xml @@ -10,7 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-apiDemo</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-apiDemo</name> <licenses> diff --git a/sdnr/wt/odlux/apps/app-feature/pom.xml b/sdnr/wt/odlux/apps/app-feature/pom.xml index 2dea43c64..6a1db4a96 100644 --- a/sdnr/wt/odlux/apps/app-feature/pom.xml +++ b/sdnr/wt/odlux/apps/app-feature/pom.xml @@ -16,7 +16,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-apps-feature</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name> diff --git a/sdnr/wt/odlux/apps/app-installer/pom.xml b/sdnr/wt/odlux/apps/app-installer/pom.xml index 608bd1ff9..c8ce82dc6 100755 --- a/sdnr/wt/odlux/apps/app-installer/pom.xml +++ b/sdnr/wt/odlux/apps/app-installer/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-apps-installer</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/odlux/apps/configurationApp/pom.xml b/sdnr/wt/odlux/apps/configurationApp/pom.xml index 7c277a246..fb89649fc 100644 --- a/sdnr/wt/odlux/apps/configurationApp/pom.xml +++ b/sdnr/wt/odlux/apps/configurationApp/pom.xml @@ -10,7 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-configurationApp</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-configurationApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/connectApp/pom.xml b/sdnr/wt/odlux/apps/connectApp/pom.xml index 7c6273ace..4658108c5 100644 --- a/sdnr/wt/odlux/apps/connectApp/pom.xml +++ b/sdnr/wt/odlux/apps/connectApp/pom.xml @@ -10,7 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-connectApp</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-connectApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/demoApp/pom.xml b/sdnr/wt/odlux/apps/demoApp/pom.xml index 25c40607c..524f8402c 100644 --- a/sdnr/wt/odlux/apps/demoApp/pom.xml +++ b/sdnr/wt/odlux/apps/demoApp/pom.xml @@ -10,7 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-demoApp</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-demoApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/faultApp/pom.xml b/sdnr/wt/odlux/apps/faultApp/pom.xml index 0485b2651..3e0976391 100644 --- a/sdnr/wt/odlux/apps/faultApp/pom.xml +++ b/sdnr/wt/odlux/apps/faultApp/pom.xml @@ -11,7 +11,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-faultApp</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-faultApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/helpApp/pom.xml b/sdnr/wt/odlux/apps/helpApp/pom.xml index cde300b2a..2f09ee5f5 100644 --- a/sdnr/wt/odlux/apps/helpApp/pom.xml +++ b/sdnr/wt/odlux/apps/helpApp/pom.xml @@ -10,7 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-helpApp</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-helpApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/inventoryApp/pom.xml b/sdnr/wt/odlux/apps/inventoryApp/pom.xml index e5abbd322..00a2f0a5b 100644 --- a/sdnr/wt/odlux/apps/inventoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/inventoryApp/pom.xml @@ -10,7 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-inventoryApp</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-inventoryApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml index 11178acd6..642e9dba5 100644 --- a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml +++ b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml @@ -10,7 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-maintenanceApp</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-maintenanceApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/mediatorApp/pom.xml b/sdnr/wt/odlux/apps/mediatorApp/pom.xml index e56eae520..9d4121a98 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/pom.xml +++ b/sdnr/wt/odlux/apps/mediatorApp/pom.xml @@ -11,7 +11,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-mediatorApp</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-mediatorApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/actions/avaliableMediatorServersActions.ts b/sdnr/wt/odlux/apps/mediatorApp/src/actions/avaliableMediatorServersActions.ts index 4cbad42dd..3f56b05e1 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/src/actions/avaliableMediatorServersActions.ts +++ b/sdnr/wt/odlux/apps/mediatorApp/src/actions/avaliableMediatorServersActions.ts @@ -1,3 +1,20 @@ +/** + * ============LICENSE_START======================================================================== + * ONAP : ccsdk feature sdnr wt odlux + * ================================================================================================= + * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved. + * ================================================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + * ============LICENSE_END========================================================================== + */ import { Action } from '../../../../framework/src/flux/action'; import { Dispatch } from '../../../../framework/src/flux/store'; import { AddSnackbarNotification } from '../../../../framework/src/actions/snackbarActions'; diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorConfigActions.ts b/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorConfigActions.ts index 058110614..516515ab2 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorConfigActions.ts +++ b/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorConfigActions.ts @@ -1,3 +1,20 @@ +/** + * ============LICENSE_START======================================================================== + * ONAP : ccsdk feature sdnr wt odlux + * ================================================================================================= + * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved. + * ================================================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + * ============LICENSE_END========================================================================== + */ import { Action } from '../../../../framework/src/flux/action'; import { Dispatch } from '../../../../framework/src/flux/store'; @@ -12,25 +29,25 @@ import { MediatorConfig, MediatorConfigResponse } from '../models/mediatorServer export class BaseAction extends Action { } export class SetMediatorBusyByName extends BaseAction { - constructor (public name: string, public isBusy: boolean) { + constructor(public name: string, public isBusy: boolean) { super(); } } export class AddMediatorConfig extends BaseAction { - constructor (public mediatorConfig: MediatorConfigResponse) { + constructor(public mediatorConfig: MediatorConfigResponse) { super(); } } export class UpdateMediatorConfig extends BaseAction { - constructor (public name: string, public mediatorConfig: MediatorConfigResponse) { + constructor(public name: string, public mediatorConfig: MediatorConfigResponse) { super(); } } export class RemoveMediatorConfig extends BaseAction { - constructor (public name: string) { + constructor(public name: string) { super(); } } @@ -38,13 +55,13 @@ export class RemoveMediatorConfig extends BaseAction { export const startMediatorByNameAsyncActionCreator = (name: string) => (dispatch: Dispatch, getState: () => IApplicationStoreState) => { dispatch(new SetMediatorBusyByName(name, true)); - const { mediator: { mediatorServerState: { url } } } = getState(); - if (url) { - mediatorService.startMediatorByName(url, name).then(msg => { + const { mediator: { mediatorServerState: { id } } } = getState(); + if (id) { + mediatorService.startMediatorByName(id, name).then(msg => { dispatch(new AddSnackbarNotification({ message: msg + ' ' + name, options: { variant: 'info' } })); // since there is no notification, a timeout will be need here window.setTimeout(() => { - mediatorService.getMediatorServerConfigByName(url, name).then(config => { + mediatorService.getMediatorServerConfigByName(id, name).then(config => { if (config) { dispatch(new UpdateMediatorConfig(name, config)); } else { @@ -62,13 +79,13 @@ export const startMediatorByNameAsyncActionCreator = (name: string) => (dispatch export const stopMediatorByNameAsyncActionCreator = (name: string) => (dispatch: Dispatch, getState: () => IApplicationStoreState) => { dispatch(new SetMediatorBusyByName(name, true)); - const { mediator: { mediatorServerState: { url } } } = getState(); - if (url) { - mediatorService.stopMediatorByName(url, name).then(msg => { + const { mediator: { mediatorServerState: { id } } } = getState(); + if (id) { + mediatorService.stopMediatorByName(id, name).then(msg => { dispatch(new AddSnackbarNotification({ message: msg + ' ' + name, options: { variant: 'info' } })); // since there is no notification, a timeout will be need here window.setTimeout(() => { - mediatorService.getMediatorServerConfigByName(url, name).then(config => { + mediatorService.getMediatorServerConfigByName(id, name).then(config => { if (config) { dispatch(new UpdateMediatorConfig(name, config)); } else { @@ -86,13 +103,13 @@ export const stopMediatorByNameAsyncActionCreator = (name: string) => (dispatch: export const addMediatorConfigAsyncActionCreator = (config: MediatorConfig) => (dispatch: Dispatch, getState: () => IApplicationStoreState) => { const { Name: name } = config; - const { mediator: { mediatorServerState: { url } } } = getState(); - if (url) { - mediatorService.createMediatorConfig(url, config).then(msg => { + const { mediator: { mediatorServerState: { id } } } = getState(); + if (id) { + mediatorService.createMediatorConfig(id, config).then(msg => { dispatch(new AddSnackbarNotification({ message: msg + ' ' + name, options: { variant: 'info' } })); // since there is no notification, a timeout will be need here window.setTimeout(() => { - mediatorService.getMediatorServerConfigByName(url, name).then(config => { + mediatorService.getMediatorServerConfigByName(id, name).then(config => { if (config) { dispatch(new AddMediatorConfig(config)); } else { @@ -112,13 +129,13 @@ export const updateMediatorConfigAsyncActionCreator = (config: MediatorConfig) = export const removeMediatorConfigAsyncActionCreator = (config: MediatorConfig) => (dispatch: Dispatch, getState: () => IApplicationStoreState) => { const { Name: name } = config; - const { mediator: { mediatorServerState: { url } } } = getState(); - if (url) { - mediatorService.deleteMediatorConfigByName(url, name).then(msg => { + const { mediator: { mediatorServerState: { id } } } = getState(); + if (id) { + mediatorService.deleteMediatorConfigByName(id, name).then(msg => { dispatch(new AddSnackbarNotification({ message: msg + ' ' + name, options: { variant: 'info' } })); // since there is no notification, a timeout will be need here window.setTimeout(() => { - mediatorService.getMediatorServerConfigByName(url, config.Name).then(config => { + mediatorService.getMediatorServerConfigByName(id, config.Name).then(config => { if (!config) { dispatch(new RemoveMediatorConfig(name)); } else { diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorServerActions.ts b/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorServerActions.ts index e7719aac5..143dd7d4a 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorServerActions.ts +++ b/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorServerActions.ts @@ -1,3 +1,20 @@ +/** + * ============LICENSE_START======================================================================== + * ONAP : ccsdk feature sdnr wt odlux + * ================================================================================================= + * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved. + * ================================================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + * ============LICENSE_END========================================================================== + */ import { Action } from '../../../../framework/src/flux/action'; import { Dispatch } from '../../../../framework/src/flux/store'; @@ -11,7 +28,7 @@ import { IApplicationStoreState } from '../../../../framework/src/store/applicat export class BaseAction extends Action { } export class SetMediatorServerBusy extends BaseAction { - constructor (public isBusy: boolean) { + constructor(public isBusy: boolean) { super(); } } @@ -20,7 +37,7 @@ export class SetMediatorServerInfo extends BaseAction { /** * Initializes a new instance of this class. */ - constructor (public name: string | null, public url: string | null) { + constructor(public id: string | null, public name: string | null, public url: string | null) { super(); } @@ -30,7 +47,7 @@ export class SetMediatorServerVersion extends BaseAction { /** * Initializes a new instance of this class. */ - constructor (public versionInfo: MediatorServerVersionInfo | null) { + constructor(public versionInfo: MediatorServerVersionInfo | null) { super(); } @@ -40,7 +57,7 @@ export class SetAllMediatorServerConfigurations extends BaseAction { /** * Initializes a new instance of this class. */ - constructor (public allConfigurations: MediatorConfigResponse[] | null) { + constructor(public allConfigurations: MediatorConfigResponse[] | null) { super(); } @@ -50,7 +67,7 @@ export class SetMediatorServerSupportedDevices extends BaseAction { /** * Initializes a new instance of this class. */ - constructor (public devices: MediatorServerDevice[] | null) { + constructor(public devices: MediatorServerDevice[] | null) { super(); } @@ -65,16 +82,16 @@ export const initializeMediatorServerAsyncActionCreator = (serverId: string) => dispatch(new NavigateToApplication("mediator")); return; } - dispatch(new SetMediatorServerInfo(mediatorServer.name, mediatorServer.url)); + dispatch(new SetMediatorServerInfo(mediatorServer._id, mediatorServer.name, mediatorServer.url)); - mediatorService.getMediatorServerVersion(mediatorServer.url).then(versionInfo => { + mediatorService.getMediatorServerVersion(mediatorServer._id).then(versionInfo => { dispatch(new SetMediatorServerVersion(versionInfo)); }); Promise.all([ - mediatorService.getMediatorServerAllConfigs(mediatorServer.url), - mediatorService.getMediatorServerSupportedDevices(mediatorServer.url) - ]).then(([configurations,supportedDevices]) => { + mediatorService.getMediatorServerAllConfigs(mediatorServer._id), + mediatorService.getMediatorServerSupportedDevices(mediatorServer._id) + ]).then(([configurations, supportedDevices]) => { dispatch(new SetAllMediatorServerConfigurations(configurations)); dispatch(new SetMediatorServerSupportedDevices(supportedDevices)); dispatch(new SetMediatorServerBusy(false)); diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorConfigDialog.tsx b/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorConfigDialog.tsx index ef12ee253..20ece4c22 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorConfigDialog.tsx +++ b/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorConfigDialog.tsx @@ -1,3 +1,20 @@ +/** + * ============LICENSE_START======================================================================== + * ONAP : ccsdk feature sdnr wt odlux + * ================================================================================================= + * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved. + * ================================================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + * ============LICENSE_END========================================================================== + */ import * as React from 'react'; import { Theme, createStyles, WithStyles, withStyles, Typography, FormControlLabel, Checkbox } from '@material-ui/core'; diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorServerDialog.tsx b/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorServerDialog.tsx index 39f9036a6..d38fb0b6e 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorServerDialog.tsx +++ b/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorServerDialog.tsx @@ -1,3 +1,20 @@ +/** + * ============LICENSE_START======================================================================== + * ONAP : ccsdk feature sdnr wt odlux + * ================================================================================================= + * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved. + * ================================================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + * ============LICENSE_END========================================================================== + */ import * as React from 'react'; import Button from '@material-ui/core/Button'; diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/handlers/avaliableMediatorServersHandler.ts b/sdnr/wt/odlux/apps/mediatorApp/src/handlers/avaliableMediatorServersHandler.ts index 244a9d185..c22252d20 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/src/handlers/avaliableMediatorServersHandler.ts +++ b/sdnr/wt/odlux/apps/mediatorApp/src/handlers/avaliableMediatorServersHandler.ts @@ -1,3 +1,20 @@ +/** + * ============LICENSE_START======================================================================== + * ONAP : ccsdk feature sdnr wt odlux + * ================================================================================================= + * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved. + * ================================================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + * ============LICENSE_END========================================================================== + */ import { createExternal,IExternalTableState } from '../../../../framework/src/components/material-table/utilities'; import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch'; diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorAppRootHandler.ts b/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorAppRootHandler.ts index b64c0a72a..2642ec8cd 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorAppRootHandler.ts +++ b/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorAppRootHandler.ts @@ -1,3 +1,20 @@ +/** + * ============LICENSE_START======================================================================== + * ONAP : ccsdk feature sdnr wt odlux + * ================================================================================================= + * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved. + * ================================================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + * ============LICENSE_END========================================================================== + */ // main state handler import { combineActionHandler } from '../../../../framework/src/flux/middleware'; diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorServerHandler.ts b/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorServerHandler.ts index 2d3f71c82..0d137b396 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorServerHandler.ts +++ b/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorServerHandler.ts @@ -1,3 +1,20 @@ +/** + * ============LICENSE_START======================================================================== + * ONAP : ccsdk feature sdnr wt odlux + * ================================================================================================= + * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved. + * ================================================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + * ============LICENSE_END========================================================================== + */ import { XmlFileInfo, MediatorConfig, BusySymbol, MediatorConfigResponse, MediatorServerDevice } from "../models/mediatorServer"; import { IActionHandler } from "../../../../framework/src/flux/action"; import { SetMediatorServerVersion, SetMediatorServerInfo, SetAllMediatorServerConfigurations, SetMediatorServerBusy, SetMediatorServerSupportedDevices } from "../actions/mediatorServerActions"; @@ -5,12 +22,13 @@ import { SetMediatorBusyByName, UpdateMediatorConfig, AddMediatorConfig, RemoveM export type MediatorServerState = { busy: boolean; - name: string| null ; + name: string | null; url: string | null; - serverVersion: string| null; - mediatorVersion: string| null; - nexmls: XmlFileInfo[]; - configurations: MediatorConfigResponse[]; + id: string | null; + serverVersion: string | null; + mediatorVersion: string | null; + nexmls: XmlFileInfo[]; + configurations: MediatorConfigResponse[]; supportedDevices: MediatorServerDevice[]; } @@ -18,10 +36,11 @@ const mediatorServerInit: MediatorServerState = { busy: false, name: null, url: null, - serverVersion : null, + id: null, + serverVersion: null, mediatorVersion: null, nexmls: [], - configurations: [], + configurations: [], supportedDevices: [] } @@ -36,60 +55,61 @@ export const mediatorServerHandler: IActionHandler<MediatorServerState> = (state ...state, name: action.name, url: action.url, + id: action.id, }; } else if (action instanceof SetMediatorServerVersion) { state = { ...state, - serverVersion: action.versionInfo && action.versionInfo.server , - mediatorVersion: action.versionInfo && action.versionInfo.mediator , - nexmls: action.versionInfo && [...action.versionInfo.nexmls] || [], + serverVersion: action.versionInfo && action.versionInfo.server, + mediatorVersion: action.versionInfo && action.versionInfo.mediator, + nexmls: action.versionInfo && [...action.versionInfo.nexmls] || [], }; } else if (action instanceof SetAllMediatorServerConfigurations) { state = { ...state, - configurations: action.allConfigurations && action.allConfigurations.map(config => ({...config, busy: false}) ) || [], + configurations: action.allConfigurations && action.allConfigurations.map(config => ({ ...config, busy: false })) || [], }; } else if (action instanceof SetMediatorServerSupportedDevices) { state = { ...state, - supportedDevices: action.devices || [], + supportedDevices: action.devices || [], }; } else if (action instanceof SetMediatorBusyByName) { const index = state.configurations.findIndex(config => config.Name === action.name); if (index > -1) state = { ...state, - configurations:[ + configurations: [ ...state.configurations.slice(0, index), - { ...state.configurations[index], [BusySymbol]: action.isBusy }, + { ...state.configurations[index], [BusySymbol]: action.isBusy }, ...state.configurations.slice(index + 1) - ] + ] }; } else if (action instanceof AddMediatorConfig) { - state = { + state = { ...state, configurations: [ - ...state.configurations, - action.mediatorConfig - ] + ...state.configurations, + action.mediatorConfig + ] }; } else if (action instanceof UpdateMediatorConfig) { const index = state.configurations.findIndex(config => config.Name === action.name); if (index > -1) state = { ...state, - configurations:[ + configurations: [ ...state.configurations.slice(0, index), - { ...action.mediatorConfig, [BusySymbol]: state.configurations[index][BusySymbol] }, + { ...action.mediatorConfig, [BusySymbol]: state.configurations[index][BusySymbol] }, ...state.configurations.slice(index + 1) - ] + ] }; } else if (action instanceof RemoveMediatorConfig) { const index = state.configurations.findIndex(config => config.Name === action.name); if (index > -1) state = { ...state, - configurations:[ + configurations: [ ...state.configurations.slice(0, index), ...state.configurations.slice(index + 1) - ] + ] }; } return state; diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/models/mediatorServer.ts b/sdnr/wt/odlux/apps/mediatorApp/src/models/mediatorServer.ts index ff084b0c1..a2b54599c 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/src/models/mediatorServer.ts +++ b/sdnr/wt/odlux/apps/mediatorApp/src/models/mediatorServer.ts @@ -1,3 +1,20 @@ +/** + * ============LICENSE_START======================================================================== + * ONAP : ccsdk feature sdnr wt odlux + * ================================================================================================= + * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved. + * ================================================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + * ============LICENSE_END========================================================================== + */ export type MediatorServer = { _id: string; name: string; diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/plugin.tsx b/sdnr/wt/odlux/apps/mediatorApp/src/plugin.tsx index 7f440a2ae..5ffd0124b 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/src/plugin.tsx +++ b/sdnr/wt/odlux/apps/mediatorApp/src/plugin.tsx @@ -1,3 +1,20 @@ +/** + * ============LICENSE_START======================================================================== + * ONAP : ccsdk feature sdnr wt odlux + * ================================================================================================= + * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved. + * ================================================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + * ============LICENSE_END========================================================================== + */ // app configuration and main entry point for the app import * as React from "react"; diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/services/mediatorService.ts b/sdnr/wt/odlux/apps/mediatorApp/src/services/mediatorService.ts index 50fd869b1..b257fa92c 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/src/services/mediatorService.ts +++ b/sdnr/wt/odlux/apps/mediatorApp/src/services/mediatorService.ts @@ -1,13 +1,30 @@ +/** + * ============LICENSE_START======================================================================== + * ONAP : ccsdk feature sdnr wt odlux + * ================================================================================================= + * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved. + * ================================================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + * ============LICENSE_END========================================================================== + */ import * as $ from 'jquery'; -import { requestRest } from '../../../../framework/src/services/restService'; +import { requestRest, formEncode } from '../../../../framework/src/services/restService'; import { MediatorServer, MediatorServerVersionInfo, MediatorConfig, MediatorServerDevice, MediatorConfigResponse } from '../models/mediatorServer'; import { HitEntry } from '../../../../framework/src/models'; export const mediatorServerResourcePath = "mwtn/mediator-server"; type MediatorServerResponse<TData> = { code: number, data: TData }; -type IndexableMediatorServer = MediatorServer & { [key: string]: any; } ; +type IndexableMediatorServer = MediatorServer & { [key: string]: any; }; /** * Represents a web api accessor service for all mediator server actions. @@ -60,13 +77,29 @@ class MediatorService { // https://cloud-highstreet-technologies.com/wiki/doku.php?id=att:ms:api - private accassMediatorServer<TData ={}>(mediatorServerUrl: string, task: string, data?: {}): Promise<MediatorServerResponse<TData> | null> { - const url = `${mediatorServerUrl}/api/?task=${task}`; - // return (await requestRest<{ code: number, data: TData}>(path, { method: "POST" })) || null ; + private async accassMediatorServer<TData = {}>(mediatorServerId: string, task: string, data?: {}): Promise<MediatorServerResponse<TData> | null> { + const path = `ms/${mediatorServerId}/api/'?task=${task}`; + const result = (await requestRest<string>(path, { + method: data ? "POST" : "GET", + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + }, + body: data ? formEncode({ + ...data, + ...{ task: task } + }) : null + }, true)) || null; + + return result ? JSON.parse(result) as { code: number, data: TData } : null; + } + /* + private accassMediatorServer<TData = {}>(mediatorServerId: string, task: string, data?: {}): Promise<MediatorServerResponse<TData> | null> { + const path = `ms/${mediatorServerId}/api/?task=${task}`; return new Promise<{ code: number, data: TData }>((resolve, reject) => { - $.post({ - url, - data: data, + $.ajax({ + method: data ? 'POST' : 'GET', + url: path, + data: { ...{ task: task }, ...data }, //contentType: 'application/json' }).then((result: any) => { if (typeof result === "string") { @@ -76,70 +109,70 @@ class MediatorService { }; }); }); - } + }*/ - public async getMediatorServerVersion(mediatorServerUrl: string): Promise<MediatorServerVersionInfo | null> { - const result = await this.accassMediatorServer<MediatorServerVersionInfo>(mediatorServerUrl, 'version'); + public async getMediatorServerVersion(mediatorServerId: string): Promise<MediatorServerVersionInfo | null> { + const result = await this.accassMediatorServer<MediatorServerVersionInfo>(mediatorServerId, 'version'); if (result && result.code === 1) return result.data; return null; } - public async getMediatorServerAllConfigs(mediatorServerUrl: string): Promise<MediatorConfigResponse[] | null> { - const result = await this.accassMediatorServer<MediatorConfigResponse[]>(mediatorServerUrl, 'getconfig'); + public async getMediatorServerAllConfigs(mediatorServerId: string): Promise<MediatorConfigResponse[] | null> { + const result = await this.accassMediatorServer<MediatorConfigResponse[]>(mediatorServerId, 'getconfig'); if (result && result.code === 1) return result.data; return null; } - public async getMediatorServerConfigByName(mediatorServerUrl: string, name: string): Promise<MediatorConfigResponse | null> { - const result = await this.accassMediatorServer<MediatorConfigResponse[]>(mediatorServerUrl, 'getconfig', { name } ); + public async getMediatorServerConfigByName(mediatorServerId: string, name: string): Promise<MediatorConfigResponse | null> { + const result = await this.accassMediatorServer<MediatorConfigResponse[]>(mediatorServerId, `getconfig&name=${name}`); if (result && result.code === 1 && result.data && result.data.length === 1) return result.data[0]; return null; } - public async getMediatorServerSupportedDevices(mediatorServerUrl: string): Promise<MediatorServerDevice[] | null> { - const result = await this.accassMediatorServer<MediatorServerDevice[]>(mediatorServerUrl, 'getdevices' ); + public async getMediatorServerSupportedDevices(mediatorServerId: string): Promise<MediatorServerDevice[] | null> { + const result = await this.accassMediatorServer<MediatorServerDevice[]>(mediatorServerId, 'getdevices'); if (result && result.code === 1) return result.data; return null; } - public async startMediatorByName(mediatorServerUrl: string, name: string): Promise<string | null> { - const result = await this.accassMediatorServer<string>(mediatorServerUrl, 'start', { name } ); + public async startMediatorByName(mediatorServerId: string, name: string): Promise<string | null> { + const result = await this.accassMediatorServer<string>(mediatorServerId, `start&name=${name}`); if (result && result.code === 1) return result.data; return null; } - public async stopMediatorByName(mediatorServerUrl: string, name: string): Promise<string | null> { - const result = await this.accassMediatorServer<string>(mediatorServerUrl, 'stop', { name } ); + public async stopMediatorByName(mediatorServerId: string, name: string): Promise<string | null> { + const result = await this.accassMediatorServer<string>(mediatorServerId, `stop&name=${name}`); if (result && result.code === 1) return result.data; return null; } - public async createMediatorConfig(mediatorServerUrl: string, config: MediatorConfig): Promise<string | null> { - const result = await this.accassMediatorServer<string>(mediatorServerUrl, 'create', { config: JSON.stringify(config) } ); + public async createMediatorConfig(mediatorServerId: string, config: MediatorConfig): Promise<string | null> { + const result = await this.accassMediatorServer<string>(mediatorServerId, 'create', { config: JSON.stringify(config) }); if (result && result.code === 1) return result.data; return null; } - public async updateMediatorConfigByName(mediatorServerUrl: string, config: MediatorConfig): Promise<string | null> { - const result = await this.accassMediatorServer<string>(mediatorServerUrl, 'update', { config: JSON.stringify(config) } ); + public async updateMediatorConfigByName(mediatorServerId: string, config: MediatorConfig): Promise<string | null> { + const result = await this.accassMediatorServer<string>(mediatorServerId, 'update', { config: JSON.stringify(config) }); if (result && result.code === 1) return result.data; return null; } - public async deleteMediatorConfigByName(mediatorServerUrl: string, name: string): Promise<string | null> { - const result = await this.accassMediatorServer<string>(mediatorServerUrl, 'delete', { name } ); + public async deleteMediatorConfigByName(mediatorServerId: string, name: string): Promise<string | null> { + const result = await this.accassMediatorServer<string>(mediatorServerId, `delete&name=${name}`); if (result && result.code === 1) return result.data; return null; } - public async getMediatorServerFreeNcPorts(mediatorServerUrl: string, limit?: number): Promise<number[] | null> { - const result = await this.accassMediatorServer<number[]>(mediatorServerUrl, 'getncports', { limit } ); + public async getMediatorServerFreeNcPorts(mediatorServerId: string, limit?: number): Promise<number[] | null> { + const result = await this.accassMediatorServer<number[]>(mediatorServerId, 'getncports', { limit }); if (result && result.code === 1) return result.data; return null; } - - public async getMediatorServerFreeSnmpPorts(mediatorServerUrl: string, limit?: number): Promise<number[] | null> { - const result = await this.accassMediatorServer<number[]>(mediatorServerUrl, 'getsnmpports', { limit } ); + + public async getMediatorServerFreeSnmpPorts(mediatorServerId: string, limit?: number): Promise<number[] | null> { + const result = await this.accassMediatorServer<number[]>(mediatorServerId, 'getsnmpports', { limit }); if (result && result.code === 1) return result.data; return null; } diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorApplication.tsx b/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorApplication.tsx index 95dee8df7..fcb3fe46f 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorApplication.tsx +++ b/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorApplication.tsx @@ -1,3 +1,20 @@ +/** + * ============LICENSE_START======================================================================== + * ONAP : ccsdk feature sdnr wt odlux + * ================================================================================================= + * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved. + * ================================================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + * ============LICENSE_END========================================================================== + */ import * as React from 'react'; import { Theme, createStyles, WithStyles, withStyles, Tooltip } from '@material-ui/core'; @@ -52,6 +69,7 @@ const styles = (theme: Theme) => createStyles({ const mapProps = (state: IApplicationStoreState) => ({ serverName: state.mediator.mediatorServerState.name, serverUrl: state.mediator.mediatorServerState.url, + serverId: state.mediator.mediatorServerState.id, serverVersion: state.mediator.mediatorServerState.serverVersion, mediatorVersion: state.mediator.mediatorServerState.mediatorVersion, configurations: state.mediator.mediatorServerState.configurations, @@ -89,7 +107,7 @@ type MediatorServerSelectionComponentState = { class MediatorApplicationComponent extends React.Component<MediatorApplicationComponentProps, MediatorServerSelectionComponentState> { - constructor (props: MediatorApplicationComponentProps) { + constructor(props: MediatorApplicationComponentProps) { super(props); this.state = { @@ -120,7 +138,7 @@ class MediatorApplicationComponent extends React.Component<MediatorApplicationCo <Tooltip title={"Info"} ><IconButton className={classes.button}><InfoIcon /></IconButton></Tooltip> </div> <div className={classes.spacer}> - { process.env.NODE_ENV === "development" ? <Tooltip title={"Edit"} ><IconButton disabled={rowData[BusySymbol]} className={classes.button} onClick={event => this.onOpenEditConfigurationDialog(event, rowData)}><EditIcon /></IconButton></Tooltip> : null} + {process.env.NODE_ENV === "development" ? <Tooltip title={"Edit"} ><IconButton disabled={rowData[BusySymbol]} className={classes.button} onClick={event => this.onOpenEditConfigurationDialog(event, rowData)}><EditIcon /></IconButton></Tooltip> : null} <Tooltip title={"Remove"} ><IconButton disabled={rowData[BusySymbol]} className={classes.button} onClick={event => this.onOpenRemoveConfigutationDialog(event, rowData)}><DeleteIcon /></IconButton></Tooltip> </div> </> @@ -166,9 +184,9 @@ class MediatorApplicationComponent extends React.Component<MediatorApplicationCo this.setState({ busy: true, }); - this.props.serverUrl && Promise.all([ - mediatorService.getMediatorServerFreeNcPorts(this.props.serverUrl, 1), - mediatorService.getMediatorServerFreeSnmpPorts(this.props.serverUrl, 1), + this.props.serverId && Promise.all([ + mediatorService.getMediatorServerFreeNcPorts(this.props.serverId, 1), + mediatorService.getMediatorServerFreeSnmpPorts(this.props.serverId, 1), ]).then(([freeNcPorts, freeSnmpPorts]) => { if (freeNcPorts && freeSnmpPorts && freeNcPorts.length > 0 && freeSnmpPorts.length > 0) { this.setState({ diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorServerSelection.tsx b/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorServerSelection.tsx index 4e221b613..a23afb5f6 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorServerSelection.tsx +++ b/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorServerSelection.tsx @@ -1,3 +1,20 @@ +/** + * ============LICENSE_START======================================================================== + * ONAP : ccsdk feature sdnr wt odlux + * ================================================================================================= + * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved. + * ================================================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + * ============LICENSE_END========================================================================== + */ import * as React from 'react'; import { WithStyles, withStyles, createStyles, Theme, Tooltip } from '@material-ui/core'; diff --git a/sdnr/wt/odlux/apps/minimumApp/pom.xml b/sdnr/wt/odlux/apps/minimumApp/pom.xml index cc7f27370..8573e3db1 100644 --- a/sdnr/wt/odlux/apps/minimumApp/pom.xml +++ b/sdnr/wt/odlux/apps/minimumApp/pom.xml @@ -10,7 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-minimumApp</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-minimumApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml index 8f771740c..5e92795a6 100644 --- a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml @@ -10,7 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-performanceHistoryApp</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-performanceHistoryApp</name> <licenses> diff --git a/sdnr/wt/odlux/core/features/pom.xml b/sdnr/wt/odlux/core/features/pom.xml index ef34dc1cf..54ddea2ce 100644 --- a/sdnr/wt/odlux/core/features/pom.xml +++ b/sdnr/wt/odlux/core/features/pom.xml @@ -16,7 +16,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-core-feature</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name> diff --git a/sdnr/wt/odlux/core/installer/pom.xml b/sdnr/wt/odlux/core/installer/pom.xml index dca67d0a7..7475e003f 100755 --- a/sdnr/wt/odlux/core/installer/pom.xml +++ b/sdnr/wt/odlux/core/installer/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-core-installer</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/odlux/core/model/pom.xml b/sdnr/wt/odlux/core/model/pom.xml index fc02da6b4..537acd33a 100644 --- a/sdnr/wt/odlux/core/model/pom.xml +++ b/sdnr/wt/odlux/core/model/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-core-model</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> diff --git a/sdnr/wt/odlux/core/pom.xml b/sdnr/wt/odlux/core/pom.xml index 4d276d49e..ba43efc5c 100644 --- a/sdnr/wt/odlux/core/pom.xml +++ b/sdnr/wt/odlux/core/pom.xml @@ -12,7 +12,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-core-top</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>odlux-core</name> diff --git a/sdnr/wt/odlux/core/provider/pom.xml b/sdnr/wt/odlux/core/provider/pom.xml index 022300db0..048c655ad 100644 --- a/sdnr/wt/odlux/core/provider/pom.xml +++ b/sdnr/wt/odlux/core/provider/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-core-provider</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> diff --git a/sdnr/wt/odlux/framework/pom.xml b/sdnr/wt/odlux/framework/pom.xml index 035c4b804..fd90d3713 100644 --- a/sdnr/wt/odlux/framework/pom.xml +++ b/sdnr/wt/odlux/framework/pom.xml @@ -10,7 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-framework</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>jar</packaging> <name>sdnr-wt-odlux-framework</name> <properties> diff --git a/sdnr/wt/odlux/pom.xml b/sdnr/wt/odlux/pom.xml index ba14429e5..732e00647 100644 --- a/sdnr/wt/odlux/pom.xml +++ b/sdnr/wt/odlux/pom.xml @@ -12,7 +12,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>odlux-top</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>odlux</name> diff --git a/sdnr/wt/pom.xml b/sdnr/wt/pom.xml index c56dcc0c6..8089fc263 100644 --- a/sdnr/wt/pom.xml +++ b/sdnr/wt/pom.xml @@ -30,7 +30,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sdnr-wireless transport :: micro-services</name> <description>SDN-R wireless transport micro-services</description> diff --git a/sdnr/wt/websocketmanager2/feature/pom.xml b/sdnr/wt/websocketmanager2/feature/pom.xml index bf96a017d..d4c0e21ce 100644 --- a/sdnr/wt/websocketmanager2/feature/pom.xml +++ b/sdnr/wt/websocketmanager2/feature/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-websocketmanager2-feature</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name> diff --git a/sdnr/wt/websocketmanager2/installer/pom.xml b/sdnr/wt/websocketmanager2/installer/pom.xml index 0d10225d7..4abe6e634 100755 --- a/sdnr/wt/websocketmanager2/installer/pom.xml +++ b/sdnr/wt/websocketmanager2/installer/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-websocketmanager2-installer</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/websocketmanager2/model/pom.xml b/sdnr/wt/websocketmanager2/model/pom.xml index 9b066b9e2..08605b80c 100644 --- a/sdnr/wt/websocketmanager2/model/pom.xml +++ b/sdnr/wt/websocketmanager2/model/pom.xml @@ -25,7 +25,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-websocketmanager2-model</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> diff --git a/sdnr/wt/websocketmanager2/pom.xml b/sdnr/wt/websocketmanager2/pom.xml index fd7822e86..8f5463cd0 100755 --- a/sdnr/wt/websocketmanager2/pom.xml +++ b/sdnr/wt/websocketmanager2/pom.xml @@ -26,7 +26,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-websocketmanager2-top</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/websocketmanager2/provider/pom.xml b/sdnr/wt/websocketmanager2/provider/pom.xml index 814341832..cca8aa6c6 100644 --- a/sdnr/wt/websocketmanager2/provider/pom.xml +++ b/sdnr/wt/websocketmanager2/provider/pom.xml @@ -14,7 +14,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-websocketmanager2-provider</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.2-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> <parent> diff --git a/version.properties b/version.properties index 813522d54..6a35b9035 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=0 sprint_number=5 -feature_revision=1 +feature_revision=2 base_version=${release_name}.${sprint_number}.${feature_revision} |