Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4766918D53 for ; Wed, 23 Dec 2015 11:06:26 +0000 (UTC) Received: (qmail 62774 invoked by uid 500); 23 Dec 2015 11:06:25 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 62721 invoked by uid 500); 23 Dec 2015 11:06:25 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 61633 invoked by uid 99); 23 Dec 2015 11:06:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Dec 2015 11:06:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 26837E0329; Wed, 23 Dec 2015 11:06:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.apache.org Date: Wed, 23 Dec 2015 11:07:08 -0000 Message-Id: In-Reply-To: <82cddab19a4b4acba6c40d27bf52d288@git.apache.org> References: <82cddab19a4b4acba6c40d27bf52d288@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [45/71] [abbrv] incubator-brooklyn git commit: [SERVER] [LIBRARY] moved missing resources and fixed CAMP tests moved in 7007c65 [SERVER] [LIBRARY] moved missing resources and fixed CAMP tests moved in 7007c65 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/265f0fea Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/265f0fea Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/265f0fea Branch: refs/heads/master Commit: 265f0fea7fd3db86533745a6252e2fe29c1e2c97 Parents: 980237e Author: John McCabe Authored: Wed Dec 16 20:40:59 2015 +0000 Committer: Alex Heneveld Committed: Mon Dec 21 16:43:36 2015 +0000 ---------------------------------------------------------------------- brooklyn-library/software/webapp/pom.xml | 15 ++++ .../camp/EnrichersSlightlySimplerYamlTest.java | 3 +- .../test/camp/EntitiesYamlIntegrationTest.java | 3 +- .../test/camp/JavaWebAppsIntegrationTest.java | 2 +- .../java-web-app-and-db-with-function.yaml | 36 ++++++++++ .../java-web-app-and-db-with-policy.yaml | 46 ++++++++++++ .../src/test/resources/java-web-app-simple.yaml | 28 ++++++++ ...est-app-with-enrichers-slightly-simpler.yaml | 74 ++++++++++++++++++++ .../src/test/resources/test-tomcat-cluster.yaml | 30 ++++++++ .../test-webapp-with-averaging-enricher.yaml | 47 +++++++++++++ .../java-web-app-and-db-with-policy.yaml | 46 ------------ ...est-app-with-enrichers-slightly-simpler.yaml | 74 -------------------- .../src/test/resources/test-tomcat-cluster.yaml | 30 -------- .../test-webapp-with-averaging-enricher.yaml | 47 ------------- 14 files changed, 281 insertions(+), 200 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/265f0fea/brooklyn-library/software/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/webapp/pom.xml b/brooklyn-library/software/webapp/pom.xml index e846f33..b4b7443 100644 --- a/brooklyn-library/software/webapp/pom.xml +++ b/brooklyn-library/software/webapp/pom.xml @@ -154,6 +154,21 @@ test + + + org.apache.brooklyn + brooklyn-camp + 0.9.SPLITWIP-SNAPSHOT + test + + + org.apache.brooklyn + brooklyn-camp + ${project.version} + tests + test + + org.apache.brooklyn http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/265f0fea/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/EnrichersSlightlySimplerYamlTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/EnrichersSlightlySimplerYamlTest.java b/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/EnrichersSlightlySimplerYamlTest.java index fb46789..b74d9af 100644 --- a/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/EnrichersSlightlySimplerYamlTest.java +++ b/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/EnrichersSlightlySimplerYamlTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.brooklyn.camp.brooklyn; +package org.apache.brooklyn.test.camp; import java.net.URI; import java.util.Collection; @@ -24,6 +24,7 @@ import java.util.Iterator; import java.util.List; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.EntityInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/265f0fea/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/EntitiesYamlIntegrationTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/EntitiesYamlIntegrationTest.java b/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/EntitiesYamlIntegrationTest.java index c511e82..a600fc1 100644 --- a/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/EntitiesYamlIntegrationTest.java +++ b/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/EntitiesYamlIntegrationTest.java @@ -16,12 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.brooklyn.camp.brooklyn; +package org.apache.brooklyn.test.camp; import static org.testng.Assert.*; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/265f0fea/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/JavaWebAppsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/JavaWebAppsIntegrationTest.java b/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/JavaWebAppsIntegrationTest.java index 3d991db..a812998 100644 --- a/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/JavaWebAppsIntegrationTest.java +++ b/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/JavaWebAppsIntegrationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.brooklyn.camp.brooklyn; +package org.apache.brooklyn.test.camp; import static com.google.common.base.Preconditions.checkNotNull; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/265f0fea/brooklyn-library/software/webapp/src/test/resources/java-web-app-and-db-with-function.yaml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/webapp/src/test/resources/java-web-app-and-db-with-function.yaml b/brooklyn-library/software/webapp/src/test/resources/java-web-app-and-db-with-function.yaml new file mode 100644 index 0000000..0f15729 --- /dev/null +++ b/brooklyn-library/software/webapp/src/test/resources/java-web-app-and-db-with-function.yaml @@ -0,0 +1,36 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# +name: java-cluster-db-example +services: +- serviceType: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster + name: My Web + location: localhost + brooklyn.config: + wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.7.0-M1/brooklyn-example-hello-world-sql-webapp-0.7.0-M1.war + http.port: 9280+ + proxy.http.port: 9210+ + java.sysprops: + brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s&password=%s", + component("db").attributeWhenReady("datastore.url"), "visitors", "brooklyn", "br00k11n") +- serviceType: org.apache.brooklyn.entity.database.mysql.MySqlNode + id: db + name: My DB + location: localhost + brooklyn.config: + datastore.creation.script.url: classpath://visitors-creation-script.sql http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/265f0fea/brooklyn-library/software/webapp/src/test/resources/java-web-app-and-db-with-policy.yaml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/webapp/src/test/resources/java-web-app-and-db-with-policy.yaml b/brooklyn-library/software/webapp/src/test/resources/java-web-app-and-db-with-policy.yaml new file mode 100644 index 0000000..10ea4e5 --- /dev/null +++ b/brooklyn-library/software/webapp/src/test/resources/java-web-app-and-db-with-policy.yaml @@ -0,0 +1,46 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# +name: java-cluster-db-policy-example +services: +- type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster + name: My Web with Policy + location: localhost + brooklyn.config: + wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0-M2/brooklyn-example-hello-world-sql-webapp-0.6.0-M2.war + http.port: 9280+ + proxy.http.port: 9210+ + java.sysprops: + brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s&password=%s", + component("db").attributeWhenReady("datastore.url"), "visitors", "brooklyn", "br00k11n") + brooklyn.policies: + - policyType: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy + brooklyn.config: + metric: $brooklyn:sensor("org.apache.brooklyn.entity.webapp.DynamicWebAppCluster", "webapp.reqs.perSec.windowed.perNode") + metricLowerBound: 10 + metricUpperBound: 100 + minPoolSize: 1 + maxPoolSize: 5 + +- type: org.apache.brooklyn.entity.database.mysql.MySqlNode + id: db + name: My DB + location: localhost + brooklyn.config: + # this also uses the flag rather than the config key + creationScriptUrl: classpath://visitors-creation-script.sql http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/265f0fea/brooklyn-library/software/webapp/src/test/resources/java-web-app-simple.yaml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/webapp/src/test/resources/java-web-app-simple.yaml b/brooklyn-library/software/webapp/src/test/resources/java-web-app-simple.yaml new file mode 100644 index 0000000..526e90b --- /dev/null +++ b/brooklyn-library/software/webapp/src/test/resources/java-web-app-simple.yaml @@ -0,0 +1,28 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# +name: sample-single-jboss +description: Single JBoss using Brooklyn +origin: https://github.com/apache/incubator-brooklyn +location: localhost +services: +- serviceType: org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server + name: tomcat1 + brooklyn.config: + wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-webapp/0.7.0-M1/brooklyn-example-hello-world-webapp-0.7.0-M1.war + http.port: 9280+ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/265f0fea/brooklyn-library/software/webapp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/webapp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml b/brooklyn-library/software/webapp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml new file mode 100644 index 0000000..2b55237 --- /dev/null +++ b/brooklyn-library/software/webapp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml @@ -0,0 +1,74 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# +# example showing how enrichers can be set +# +name: test-app-with-enrichers +description: Testing many enrichers +services: +- type: org.apache.brooklyn.entity.group.DynamicCluster + id: cluster + initialSize: 3 + location: localhost + memberSpec: + $brooklyn:entitySpec: + type: org.apache.brooklyn.core.test.entity.TestEntity + brooklyn.enrichers: + - type: org.apache.brooklyn.enricher.stock.Transformer + # transform "ip" (which we expect a feed, not shown here, to set) to a URL; + # you can curl an address string to the sensors/ip endpoint an entity to trigger these enrichers + brooklyn.config: + enricher.sourceSensor: $brooklyn:sensor("ip") + enricher.targetSensor: $brooklyn:sensor("url") + enricher.targetValue: $brooklyn:formatString("http://%s/", $brooklyn:attributeWhenReady("ip")) + - type: org.apache.brooklyn.enricher.stock.Propagator + # use propagator to duplicate one sensor as another, giving the supplied sensor mapping; + # the other use of Propagator is where you specify a producer (using $brooklyn:entity(...) as below) + # from which to take sensors; in that mode you can specify `propagate` as a list of sensors whose names are unchanged, + # instead of (or in addition to) this map + brooklyn.config: + sensorMapping: + $brooklyn:sensor("url"): $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri") + brooklyn.enrichers: + - type: org.apache.brooklyn.enricher.stock.Aggregator + # aggregate `url` sensors from children into a list + brooklyn.config: + enricher.sourceSensor: $brooklyn:sensor("url") + enricher.targetSensor: $brooklyn:sensor("urls.list") + enricher.aggregating.fromMembers: true + - type: org.apache.brooklyn.enricher.stock.Joiner + # create a string from that list, for use e.g. in bash scripts + brooklyn.config: + enricher.sourceSensor: $brooklyn:sensor("urls.list") + enricher.targetSensor: $brooklyn:sensor("urls.list.comma_separated.max_2") + maximum: 2 + # TODO infer uniqueTag, name etc + uniqueTag: urls.list.comma_separated.max_2 + - type: org.apache.brooklyn.enricher.stock.Joiner + # pick one uri as the main one to use + brooklyn.config: + enricher.sourceSensor: $brooklyn:sensor("urls.list") + enricher.targetSensor: $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri") + quote: false + maximum: 1 +brooklyn.enrichers: +- type: org.apache.brooklyn.enricher.stock.Propagator + # if nothing specified for `propagating` or `sensorMapping` then + # Propagator will do all but the usual lifecycle defaults, handy at the root! + brooklyn.config: + producer: $brooklyn:entity("cluster") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/265f0fea/brooklyn-library/software/webapp/src/test/resources/test-tomcat-cluster.yaml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/webapp/src/test/resources/test-tomcat-cluster.yaml b/brooklyn-library/software/webapp/src/test/resources/test-tomcat-cluster.yaml new file mode 100644 index 0000000..e3087b8 --- /dev/null +++ b/brooklyn-library/software/webapp/src/test/resources/test-tomcat-cluster.yaml @@ -0,0 +1,30 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# +name: Test Tomcat cluster +location: localhost +services: +- serviceType: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster + name: tomcat-cluster + initialSize: 2 + memberSpec: + $brooklyn:entitySpec: + type: org.apache.brooklyn.entity.webapp.tomcat.TomcatServer + brooklyn.config: + dynamiccluster.quarantineFailedEntities: false + cluster.initial.quorumSize: 2 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/265f0fea/brooklyn-library/software/webapp/src/test/resources/test-webapp-with-averaging-enricher.yaml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/webapp/src/test/resources/test-webapp-with-averaging-enricher.yaml b/brooklyn-library/software/webapp/src/test/resources/test-webapp-with-averaging-enricher.yaml new file mode 100644 index 0000000..9a508cb --- /dev/null +++ b/brooklyn-library/software/webapp/src/test/resources/test-webapp-with-averaging-enricher.yaml @@ -0,0 +1,47 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# +# example showing how enrichers can be set +# +name: test-webapp-with-averaging-enricher +description: Testing many enrichers +services: +- type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster + initialSize: 3 + location: localhost + + # define the web cluster, adding an averaging enricher to the cluster. + # this assumes the test fixture will set the "my.load" sensor on the member-specs in here. + webClusterSpec: + $brooklyn:entitySpec: + type: org.apache.brooklyn.entity.webapp.DynamicWebAppCluster + id: cluster + brooklyn.enrichers: + - type: org.apache.brooklyn.enricher.stock.Aggregator + brooklyn.config: + enricher.sourceSensor: $brooklyn:sensor("my.load") + enricher.targetSensor: $brooklyn:sensor("my.load.averaged") + enricher.aggregating.fromMembers: true + transformation: average + + brooklyn.enrichers: + - type: org.apache.brooklyn.enricher.stock.Propagator + brooklyn.config: + producer: $brooklyn:entity("cluster") + propagating: + - $brooklyn:sensor("my.load.averaged") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/265f0fea/brooklyn-server/camp/camp-brooklyn/src/test/resources/java-web-app-and-db-with-policy.yaml ---------------------------------------------------------------------- diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/java-web-app-and-db-with-policy.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/java-web-app-and-db-with-policy.yaml deleted file mode 100644 index 10ea4e5..0000000 --- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/java-web-app-and-db-with-policy.yaml +++ /dev/null @@ -1,46 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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. -# -name: java-cluster-db-policy-example -services: -- type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster - name: My Web with Policy - location: localhost - brooklyn.config: - wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0-M2/brooklyn-example-hello-world-sql-webapp-0.6.0-M2.war - http.port: 9280+ - proxy.http.port: 9210+ - java.sysprops: - brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s&password=%s", - component("db").attributeWhenReady("datastore.url"), "visitors", "brooklyn", "br00k11n") - brooklyn.policies: - - policyType: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy - brooklyn.config: - metric: $brooklyn:sensor("org.apache.brooklyn.entity.webapp.DynamicWebAppCluster", "webapp.reqs.perSec.windowed.perNode") - metricLowerBound: 10 - metricUpperBound: 100 - minPoolSize: 1 - maxPoolSize: 5 - -- type: org.apache.brooklyn.entity.database.mysql.MySqlNode - id: db - name: My DB - location: localhost - brooklyn.config: - # this also uses the flag rather than the config key - creationScriptUrl: classpath://visitors-creation-script.sql http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/265f0fea/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml ---------------------------------------------------------------------- diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml deleted file mode 100644 index 2b55237..0000000 --- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml +++ /dev/null @@ -1,74 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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. -# -# example showing how enrichers can be set -# -name: test-app-with-enrichers -description: Testing many enrichers -services: -- type: org.apache.brooklyn.entity.group.DynamicCluster - id: cluster - initialSize: 3 - location: localhost - memberSpec: - $brooklyn:entitySpec: - type: org.apache.brooklyn.core.test.entity.TestEntity - brooklyn.enrichers: - - type: org.apache.brooklyn.enricher.stock.Transformer - # transform "ip" (which we expect a feed, not shown here, to set) to a URL; - # you can curl an address string to the sensors/ip endpoint an entity to trigger these enrichers - brooklyn.config: - enricher.sourceSensor: $brooklyn:sensor("ip") - enricher.targetSensor: $brooklyn:sensor("url") - enricher.targetValue: $brooklyn:formatString("http://%s/", $brooklyn:attributeWhenReady("ip")) - - type: org.apache.brooklyn.enricher.stock.Propagator - # use propagator to duplicate one sensor as another, giving the supplied sensor mapping; - # the other use of Propagator is where you specify a producer (using $brooklyn:entity(...) as below) - # from which to take sensors; in that mode you can specify `propagate` as a list of sensors whose names are unchanged, - # instead of (or in addition to) this map - brooklyn.config: - sensorMapping: - $brooklyn:sensor("url"): $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri") - brooklyn.enrichers: - - type: org.apache.brooklyn.enricher.stock.Aggregator - # aggregate `url` sensors from children into a list - brooklyn.config: - enricher.sourceSensor: $brooklyn:sensor("url") - enricher.targetSensor: $brooklyn:sensor("urls.list") - enricher.aggregating.fromMembers: true - - type: org.apache.brooklyn.enricher.stock.Joiner - # create a string from that list, for use e.g. in bash scripts - brooklyn.config: - enricher.sourceSensor: $brooklyn:sensor("urls.list") - enricher.targetSensor: $brooklyn:sensor("urls.list.comma_separated.max_2") - maximum: 2 - # TODO infer uniqueTag, name etc - uniqueTag: urls.list.comma_separated.max_2 - - type: org.apache.brooklyn.enricher.stock.Joiner - # pick one uri as the main one to use - brooklyn.config: - enricher.sourceSensor: $brooklyn:sensor("urls.list") - enricher.targetSensor: $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri") - quote: false - maximum: 1 -brooklyn.enrichers: -- type: org.apache.brooklyn.enricher.stock.Propagator - # if nothing specified for `propagating` or `sensorMapping` then - # Propagator will do all but the usual lifecycle defaults, handy at the root! - brooklyn.config: - producer: $brooklyn:entity("cluster") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/265f0fea/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-tomcat-cluster.yaml ---------------------------------------------------------------------- diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-tomcat-cluster.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-tomcat-cluster.yaml deleted file mode 100644 index e3087b8..0000000 --- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-tomcat-cluster.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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. -# -name: Test Tomcat cluster -location: localhost -services: -- serviceType: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster - name: tomcat-cluster - initialSize: 2 - memberSpec: - $brooklyn:entitySpec: - type: org.apache.brooklyn.entity.webapp.tomcat.TomcatServer - brooklyn.config: - dynamiccluster.quarantineFailedEntities: false - cluster.initial.quorumSize: 2 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/265f0fea/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-webapp-with-averaging-enricher.yaml ---------------------------------------------------------------------- diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-webapp-with-averaging-enricher.yaml b/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-webapp-with-averaging-enricher.yaml deleted file mode 100644 index 9a508cb..0000000 --- a/brooklyn-server/camp/camp-brooklyn/src/test/resources/test-webapp-with-averaging-enricher.yaml +++ /dev/null @@ -1,47 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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. -# -# example showing how enrichers can be set -# -name: test-webapp-with-averaging-enricher -description: Testing many enrichers -services: -- type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster - initialSize: 3 - location: localhost - - # define the web cluster, adding an averaging enricher to the cluster. - # this assumes the test fixture will set the "my.load" sensor on the member-specs in here. - webClusterSpec: - $brooklyn:entitySpec: - type: org.apache.brooklyn.entity.webapp.DynamicWebAppCluster - id: cluster - brooklyn.enrichers: - - type: org.apache.brooklyn.enricher.stock.Aggregator - brooklyn.config: - enricher.sourceSensor: $brooklyn:sensor("my.load") - enricher.targetSensor: $brooklyn:sensor("my.load.averaged") - enricher.aggregating.fromMembers: true - transformation: average - - brooklyn.enrichers: - - type: org.apache.brooklyn.enricher.stock.Propagator - brooklyn.config: - producer: $brooklyn:entity("cluster") - propagating: - - $brooklyn:sensor("my.load.averaged")