BIGTOP-2770: Juju charm/bundle refresh Closes #211
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/6a715b04 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/6a715b04 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/6a715b04 Branch: refs/heads/branch-1.2 Commit: 6a715b04dbde3e34eed92d3bf8838a4bc3f75132 Parents: 0068c88 Author: Kevin W Monroe <[email protected]> Authored: Thu May 11 17:28:27 2017 +0000 Committer: Evans Ye <[email protected]> Committed: Sat Jul 1 12:52:53 2017 +0000 ---------------------------------------------------------------------- bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml | 2 +- .../juju/hadoop-hbase/bundle-local.yaml | 2 +- bigtop-deploy/juju/hadoop-hbase/bundle.yaml | 14 +- bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml | 2 +- .../juju/hadoop-kafka/bundle-local.yaml | 2 +- bigtop-deploy/juju/hadoop-kafka/bundle.yaml | 14 +- .../juju/hadoop-processing/bundle-dev.yaml | 2 +- .../juju/hadoop-processing/bundle-local.yaml | 2 +- .../juju/hadoop-processing/bundle.yaml | 10 +- bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml | 34 +- .../juju/hadoop-spark/bundle-local.yaml | 34 +- bigtop-deploy/juju/hadoop-spark/bundle.yaml | 12 +- .../juju/hadoop-spark/tests/01-bundle.py | 1 - bigtop-deploy/juju/spark-processing/bundle.yaml | 4 +- .../src/charm/hbase/layer-hbase/icon.svg | 293 +------ .../layer-hbase/tests/01-basic-deployment.py | 2 +- .../hbase/layer-hbase/tests/02-smoke-test.py | 10 +- .../src/charm/kafka/layer-kafka/icon.svg | 107 +-- .../charm/kafka/layer-kafka/tests/01-deploy.py | 4 +- .../kafka/layer-kafka/tests/02-smoke-test.py | 4 +- .../layer-kafka/tests/10-config-changed.py | 12 +- .../mahout/layer-mahout/tests/01-mahout-test.py | 12 +- .../src/charm/pig/layer-pig/tests/01-deploy.py | 2 +- .../src/charm/spark/layer-spark/icon.svg | 850 +------------------ .../layer-spark/tests/01-basic-deployment.py | 2 +- .../spark/layer-spark/tests/02-smoke-test.py | 2 +- .../layer-spark/tests/03-scale-standalone.py | 7 +- .../charm/spark/layer-spark/tests/10-test-ha.py | 13 +- .../layer-zeppelin/tests/01-basic-deployment.py | 2 +- .../layer-zeppelin/tests/02-zeppelin-smoke.py | 4 +- .../layer-zookeeper/tests/01-deploy-smoke.py | 5 +- .../layer-zookeeper/tests/10-bind-address.py | 4 +- 32 files changed, 130 insertions(+), 1340 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml b/bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml index 064b84d..f7bcf56 100644 --- a/bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml +++ b/bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml @@ -34,7 +34,7 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-deploy/juju/hadoop-hbase/bundle-local.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/juju/hadoop-hbase/bundle-local.yaml b/bigtop-deploy/juju/hadoop-hbase/bundle-local.yaml index 34d3cb7..26e0f3e 100644 --- a/bigtop-deploy/juju/hadoop-hbase/bundle-local.yaml +++ b/bigtop-deploy/juju/hadoop-hbase/bundle-local.yaml @@ -34,7 +34,7 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-deploy/juju/hadoop-hbase/bundle.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/juju/hadoop-hbase/bundle.yaml b/bigtop-deploy/juju/hadoop-hbase/bundle.yaml index 618b196..ef44758 100644 --- a/bigtop-deploy/juju/hadoop-hbase/bundle.yaml +++ b/bigtop-deploy/juju/hadoop-hbase/bundle.yaml @@ -1,6 +1,6 @@ services: namenode: - charm: "cs:xenial/hadoop-namenode-14" + charm: "cs:xenial/hadoop-namenode-19" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -9,7 +9,7 @@ services: to: - "0" resourcemanager: - charm: "cs:xenial/hadoop-resourcemanager-16" + charm: "cs:xenial/hadoop-resourcemanager-21" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -18,7 +18,7 @@ services: to: - "0" slave: - charm: "cs:xenial/hadoop-slave-15" + charm: "cs:xenial/hadoop-slave-20" constraints: "mem=7G root-disk=32G" num_units: 3 annotations: @@ -29,12 +29,12 @@ services: - "2" - "3" plugin: - charm: "cs:xenial/hadoop-plugin-14" + charm: "cs:xenial/hadoop-plugin-19" annotations: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: @@ -43,7 +43,7 @@ services: to: - "4" hbase: - charm: "cs:xenial/hbase-14" + charm: "cs:xenial/hbase-20" constraints: "mem=7G root-disk=32G" num_units: 3 annotations: @@ -54,7 +54,7 @@ services: - "2" - "3" zookeeper: - charm: "cs:xenial/zookeeper-19" + charm: "cs:xenial/zookeeper-25" constraints: "mem=3G root-disk=32G" num_units: 3 annotations: http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml b/bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml index 0ea56fa..f715f78 100644 --- a/bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml +++ b/bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml @@ -34,7 +34,7 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-deploy/juju/hadoop-kafka/bundle-local.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/juju/hadoop-kafka/bundle-local.yaml b/bigtop-deploy/juju/hadoop-kafka/bundle-local.yaml index 0f26d33..82bfb16 100644 --- a/bigtop-deploy/juju/hadoop-kafka/bundle-local.yaml +++ b/bigtop-deploy/juju/hadoop-kafka/bundle-local.yaml @@ -34,7 +34,7 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-deploy/juju/hadoop-kafka/bundle.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/juju/hadoop-kafka/bundle.yaml b/bigtop-deploy/juju/hadoop-kafka/bundle.yaml index abf74bb..a68e2c5 100644 --- a/bigtop-deploy/juju/hadoop-kafka/bundle.yaml +++ b/bigtop-deploy/juju/hadoop-kafka/bundle.yaml @@ -1,6 +1,6 @@ services: namenode: - charm: "cs:xenial/hadoop-namenode-14" + charm: "cs:xenial/hadoop-namenode-19" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -9,7 +9,7 @@ services: to: - "0" resourcemanager: - charm: "cs:xenial/hadoop-resourcemanager-16" + charm: "cs:xenial/hadoop-resourcemanager-21" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -18,7 +18,7 @@ services: to: - "0" slave: - charm: "cs:xenial/hadoop-slave-15" + charm: "cs:xenial/hadoop-slave-20" constraints: "mem=7G root-disk=32G" num_units: 3 annotations: @@ -29,12 +29,12 @@ services: - "2" - "3" plugin: - charm: "cs:xenial/hadoop-plugin-14" + charm: "cs:xenial/hadoop-plugin-19" annotations: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: @@ -52,7 +52,7 @@ services: to: - "4" zookeeper: - charm: "cs:xenial/zookeeper-19" + charm: "cs:xenial/zookeeper-25" constraints: "mem=3G root-disk=32G" num_units: 3 annotations: @@ -63,7 +63,7 @@ services: - "6" - "7" kafka: - charm: "cs:xenial/kafka-15" + charm: "cs:xenial/kafka-21" constraints: "mem=3G" num_units: 1 annotations: http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml b/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml index 265e69f..42b5f38 100644 --- a/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml +++ b/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml @@ -34,7 +34,7 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml b/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml index a6dd892..736f73b 100644 --- a/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml +++ b/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml @@ -34,7 +34,7 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-deploy/juju/hadoop-processing/bundle.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/juju/hadoop-processing/bundle.yaml b/bigtop-deploy/juju/hadoop-processing/bundle.yaml index ef5195a..54bce71 100644 --- a/bigtop-deploy/juju/hadoop-processing/bundle.yaml +++ b/bigtop-deploy/juju/hadoop-processing/bundle.yaml @@ -1,6 +1,6 @@ services: namenode: - charm: "cs:xenial/hadoop-namenode-14" + charm: "cs:xenial/hadoop-namenode-19" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -9,7 +9,7 @@ services: to: - "0" resourcemanager: - charm: "cs:xenial/hadoop-resourcemanager-16" + charm: "cs:xenial/hadoop-resourcemanager-21" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -18,7 +18,7 @@ services: to: - "0" slave: - charm: "cs:xenial/hadoop-slave-15" + charm: "cs:xenial/hadoop-slave-20" constraints: "mem=7G root-disk=32G" num_units: 3 annotations: @@ -29,12 +29,12 @@ services: - "2" - "3" plugin: - charm: "cs:xenial/hadoop-plugin-14" + charm: "cs:xenial/hadoop-plugin-19" annotations: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml b/bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml index 847cebd..66136c6 100644 --- a/bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml +++ b/bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml @@ -34,8 +34,8 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" - constraints: "mem=3G" + charm: "cs:xenial/hadoop-client-8" + constraints: "mem=7G root-disk=32G" num_units: 1 annotations: gui-x: "1250" @@ -52,18 +52,7 @@ services: gui-x: "1000" gui-y: "0" to: - - "5" - zookeeper: - charm: "cs:~bigdata-dev/xenial/zookeeper" - constraints: "mem=3G root-disk=32G" - num_units: 3 - annotations: - gui-x: "500" - gui-y: "400" - to: - - "6" - - "7" - - "8" + - "4" ganglia: charm: "cs:xenial/ganglia-12" num_units: 1 @@ -97,20 +86,17 @@ relations: - [resourcemanager, slave] - [plugin, namenode] - [plugin, resourcemanager] - - [client, plugin] - [spark, plugin] - - [spark, zookeeper] + - [client, plugin] - ["ganglia-node:juju-info", "namenode:juju-info"] - ["ganglia-node:juju-info", "resourcemanager:juju-info"] - ["ganglia-node:juju-info", "slave:juju-info"] - ["ganglia-node:juju-info", "spark:juju-info"] - - ["ganglia-node:juju-info", "zookeeper:juju-info"] - ["ganglia:node", "ganglia-node:node"] - ["rsyslog-forwarder-ha:juju-info", "namenode:juju-info"] - ["rsyslog-forwarder-ha:juju-info", "resourcemanager:juju-info"] - ["rsyslog-forwarder-ha:juju-info", "slave:juju-info"] - ["rsyslog-forwarder-ha:juju-info", "spark:juju-info"] - - ["rsyslog-forwarder-ha:juju-info", "zookeeper:juju-info"] - ["rsyslog:aggregator", "rsyslog-forwarder-ha:syslog"] machines: "0": @@ -127,16 +113,4 @@ machines: constraints: "mem=7G root-disk=32G" "4": series: "xenial" - constraints: "mem=3G" - "5": - series: "xenial" constraints: "mem=7G root-disk=32G" - "6": - series: "xenial" - constraints: "mem=3G root-disk=32G" - "7": - series: "xenial" - constraints: "mem=3G root-disk=32G" - "8": - series: "xenial" - constraints: "mem=3G root-disk=32G" http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml b/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml index 61b7ecf..6e08871 100644 --- a/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml +++ b/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml @@ -34,8 +34,8 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" - constraints: "mem=3G" + charm: "cs:xenial/hadoop-client-8" + constraints: "mem=7G root-disk=32G" num_units: 1 annotations: gui-x: "1250" @@ -52,18 +52,7 @@ services: gui-x: "1000" gui-y: "0" to: - - "5" - zookeeper: - charm: "/home/ubuntu/charms/xenial/zookeeper" - constraints: "mem=3G root-disk=32G" - num_units: 3 - annotations: - gui-x: "500" - gui-y: "400" - to: - - "6" - - "7" - - "8" + - "4" ganglia: charm: "cs:xenial/ganglia-12" num_units: 1 @@ -97,20 +86,17 @@ relations: - [resourcemanager, slave] - [plugin, namenode] - [plugin, resourcemanager] - - [client, plugin] - [spark, plugin] - - [spark, zookeeper] + - [client, plugin] - ["ganglia-node:juju-info", "namenode:juju-info"] - ["ganglia-node:juju-info", "resourcemanager:juju-info"] - ["ganglia-node:juju-info", "slave:juju-info"] - ["ganglia-node:juju-info", "spark:juju-info"] - - ["ganglia-node:juju-info", "zookeeper:juju-info"] - ["ganglia:node", "ganglia-node:node"] - ["rsyslog-forwarder-ha:juju-info", "namenode:juju-info"] - ["rsyslog-forwarder-ha:juju-info", "resourcemanager:juju-info"] - ["rsyslog-forwarder-ha:juju-info", "slave:juju-info"] - ["rsyslog-forwarder-ha:juju-info", "spark:juju-info"] - - ["rsyslog-forwarder-ha:juju-info", "zookeeper:juju-info"] - ["rsyslog:aggregator", "rsyslog-forwarder-ha:syslog"] machines: "0": @@ -127,16 +113,4 @@ machines: constraints: "mem=7G root-disk=32G" "4": series: "xenial" - constraints: "mem=3G" - "5": - series: "xenial" constraints: "mem=7G root-disk=32G" - "6": - series: "xenial" - constraints: "mem=3G root-disk=32G" - "7": - series: "xenial" - constraints: "mem=3G root-disk=32G" - "8": - series: "xenial" - constraints: "mem=3G root-disk=32G" http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-deploy/juju/hadoop-spark/bundle.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/juju/hadoop-spark/bundle.yaml b/bigtop-deploy/juju/hadoop-spark/bundle.yaml index 0611495..9458b23 100644 --- a/bigtop-deploy/juju/hadoop-spark/bundle.yaml +++ b/bigtop-deploy/juju/hadoop-spark/bundle.yaml @@ -1,6 +1,6 @@ services: namenode: - charm: "cs:xenial/hadoop-namenode-14" + charm: "cs:xenial/hadoop-namenode-19" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -9,7 +9,7 @@ services: to: - "0" resourcemanager: - charm: "cs:xenial/hadoop-resourcemanager-16" + charm: "cs:xenial/hadoop-resourcemanager-21" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -18,7 +18,7 @@ services: to: - "0" slave: - charm: "cs:xenial/hadoop-slave-15" + charm: "cs:xenial/hadoop-slave-20" constraints: "mem=7G root-disk=32G" num_units: 3 annotations: @@ -29,12 +29,12 @@ services: - "2" - "3" plugin: - charm: "cs:xenial/hadoop-plugin-14" + charm: "cs:xenial/hadoop-plugin-19" annotations: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -43,7 +43,7 @@ services: to: - "4" spark: - charm: "cs:xenial/spark-34" + charm: "cs:xenial/spark-41" constraints: "mem=7G root-disk=32G" num_units: 1 options: http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py ---------------------------------------------------------------------- diff --git a/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py b/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py index 9d58cc9..1e9794f 100755 --- a/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py +++ b/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py @@ -53,7 +53,6 @@ class TestBundle(unittest.TestCase): 'resourcemanager': re.compile('ready'), 'slave': re.compile('ready'), 'spark': re.compile('ready'), - 'zookeeper': re.compile('ready'), }, timeout=3600) cls.hdfs = cls.d.sentry['namenode'][0] cls.yarn = cls.d.sentry['resourcemanager'][0] http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-deploy/juju/spark-processing/bundle.yaml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/juju/spark-processing/bundle.yaml b/bigtop-deploy/juju/spark-processing/bundle.yaml index f114ebf..8433dc0 100644 --- a/bigtop-deploy/juju/spark-processing/bundle.yaml +++ b/bigtop-deploy/juju/spark-processing/bundle.yaml @@ -1,6 +1,6 @@ services: spark: - charm: "cs:xenial/spark-34" + charm: "cs:xenial/spark-41" constraints: "mem=7G root-disk=32G" num_units: 2 options: @@ -13,7 +13,7 @@ services: - "0" - "1" zookeeper: - charm: "cs:xenial/zookeeper-19" + charm: "cs:xenial/zookeeper-25" constraints: "mem=3G root-disk=32G" num_units: 3 annotations: http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-packages/src/charm/hbase/layer-hbase/icon.svg ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/charm/hbase/layer-hbase/icon.svg b/bigtop-packages/src/charm/hbase/layer-hbase/icon.svg index 4da7352..c86bd67 100644 --- a/bigtop-packages/src/charm/hbase/layer-hbase/icon.svg +++ b/bigtop-packages/src/charm/hbase/layer-hbase/icon.svg @@ -1,278 +1,23 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - xmlns:xlink="http://www.w3.org/1999/xlink"; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; - width="96" - height="96" - id="svg6517" - version="1.1" - inkscape:version="0.48.4 r9939" - sodipodi:docname="icon.svg"> - <defs - id="defs6519"> - <linearGradient - id="Background"> - <stop - id="stop4178" - offset="0" - style="stop-color:#b8b8b8;stop-opacity:1" /> - <stop - id="stop4180" - offset="1" - style="stop-color:#c9c9c9;stop-opacity:1" /> - </linearGradient> - <filter - style="color-interpolation-filters:sRGB;" - inkscape:label="Inner Shadow" - id="filter1121"> - <feFlood - flood-opacity="0.59999999999999998" - flood-color="rgb(0,0,0)" - result="flood" - id="feFlood1123" /> - <feComposite - in="flood" - in2="SourceGraphic" - operator="out" - result="composite1" - id="feComposite1125" /> - <feGaussianBlur - in="composite1" - stdDeviation="1" - result="blur" - id="feGaussianBlur1127" /> - <feOffset - dx="0" - dy="2" - result="offset" - id="feOffset1129" /> - <feComposite - in="offset" - in2="SourceGraphic" - operator="atop" - result="composite2" - id="feComposite1131" /> - </filter> - <filter - style="color-interpolation-filters:sRGB;" - inkscape:label="Drop Shadow" - id="filter950"> - <feFlood - flood-opacity="0.25" - flood-color="rgb(0,0,0)" - result="flood" - id="feFlood952" /> - <feComposite - in="flood" - in2="SourceGraphic" - operator="in" - result="composite1" - id="feComposite954" /> - <feGaussianBlur - in="composite1" - stdDeviation="1" - result="blur" - id="feGaussianBlur956" /> - <feOffset - dx="0" - dy="1" - result="offset" - id="feOffset958" /> - <feComposite - in="SourceGraphic" - in2="offset" - operator="over" - result="composite2" - id="feComposite960" /> - </filter> - <clipPath - clipPathUnits="userSpaceOnUse" - id="clipPath873"> - <g - transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)" - id="g875" - inkscape:label="Layer 1" - style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"> - <path - style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline" - d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z" - id="path877" - inkscape:connector-curvature="0" - sodipodi:nodetypes="sssssssss" /> - </g> - </clipPath> - <filter - inkscape:collect="always" - id="filter891" - inkscape:label="Badge Shadow"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.71999962" - id="feGaussianBlur893" /> - </filter> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="4.0745362" - inkscape:cx="-19.035615" - inkscape:cy="49.018169" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:window-width="1920" - inkscape:window-height="1056" - inkscape:window-x="0" - inkscape:window-y="24" - inkscape:window-maximized="1" - showborder="true" - showguides="true" - inkscape:guide-bbox="true" - inkscape:showpageshadow="false" - inkscape:snap-global="false"> - <inkscape:grid - type="xygrid" - id="grid821" /> - <sodipodi:guide - orientation="1,0" - position="16,48" - id="guide823" /> - <sodipodi:guide - orientation="0,1" - position="64,80" - id="guide825" /> - <sodipodi:guide - orientation="1,0" - position="80,40" - id="guide827" /> - <sodipodi:guide - orientation="0,1" - position="64,16" - id="guide829" /> - </sodipodi:namedview> - <metadata - id="metadata6522"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="BACKGROUND" - inkscape:groupmode="layer" - id="layer1" - transform="translate(268,-635.29076)" - style="display:inline"> - <path - style="fill:#e6e3e2;fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)" - d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z" - id="path6455" - inkscape:connector-curvature="0" - sodipodi:nodetypes="sssssssss" /> - </g> - <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="PLACE YOUR PICTOGRAM HERE" - style="display:inline"> - <image - y="43.003983" - x="16.397383" - id="image3795" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQsAAABCCAYAAABAdfNCAAAABHNCSVQICAgIfAhkiAAADmdJREFU eJztnXtwXFUdx7/fc3c3j7s1ocku+ChUB1BaBOUh6OAogzR9YaESGauFdJpdHB3FN1VB6hNwwIFR iux22jKVx7Qio0DJ1gc+0FqQ8nCK+K6oIHmUBrLbNNncn38k6SSbx969e/feu5vz+Wv37Dm/883N 3t+ee87v/A4xRkdHx3HhcHgjyXMBLAYQQmn0icg+kvenUqnbS2xbNolEootkmxu2ROSfAH4vIrdv 3rz5N27YdMKaNWuOMU3zqwDeBeCtJCMlmugHsE9EHkyn07cAsFwXaZP169efoJTaAOBMkosBNDqx IyI3ptPpDe6qm55EIvFLku+Z0HcmnU4vddoewN5UKnWuqyJn7vsGkle7aVMBQDKZPC8cDj9F8koA p6N0RwEALSQvBLApkUj8eO3ataabQr2E5BtJfojkz5LJ5Bo/NHR2dp4WjUb3kfwEyTMdOAoAaAJw PsmbE4lEpqOjo9ltnXZIJBIfU0rtJ/lRkmfDoaPQ+Isau6nvJXmsW0ZJvr+hoeEat+z5BcmIiPyg s7PzTC/7bW9vN5RSdwFY6JZNku8Lh8PXu2XPLslk8mKSt5Gs2h8PzSiqvr7+swBeXwHbn04mk8dX wK6ncJRvetlnU1PTegCnVsB0Yt26dYsqYHdaLr/88hYAm73qT1NZQgDeV1D2smVZm5RSA6UYEpGz SH5gQlEdgPMA3F2mRqf8G8Amh207ALx5/A3JtrVr18a3b9/e7YawYiilCv8nORH5HsmXS7EjIotI rh1/T9IIhUIXAHjWDZ3FqK+vfzeAlgJNfwLwE5KHHJrdU7awuUkewLXlGAhhdDJzIvdu3ry55EeI ZDIZBvAqRp3EOIW2veSFVCp1g5OGnZ2d jymlfj6xLBKJnATAE2eBgus2NkHpaLIqmUy2AYiPvyd5 WpnaSuGMgvcWyQtSqdSLHmrQjDLi9H4YR5GcX1Dm6IZIpVLDIjLp10JEWmaqH2QsyzpQWKaUqsSj 2rRMc93KubkmtRWRWBm2SkJEFhS8/7d2FNWLk1WPmkcptXCa4v94raPaIUm/NbgJydOTyeS9duuL iGfzQzYIl6J9IiKSTafT66c4CxF5WyKR6HBilGSDk3aVQEQWJBIJR8Muku2FZfl8/q/lq3LMIqf/ EwCFI0eNc44DcJndygHzlQolaJ8IyX4AU50FyVUAVpUpzHdIvg6AW0EpD23durXHJVslMxa/cqFf /Ws0wFhQlmZWrHw+/2W/RWg0fqPnLGYnJyIf2bJly9N+C9H4j4hkSZYyd3U8gEA8mouIkPyLw7av ADXsLMYuzpCTdgD+DuBRkql0Or3PfXWaKuXRVCpVzt4Q3yA5lEql3lKOjekmOG8dHh6+xYmxSCTy OIDWcgS5BcnHvNq04wFbh4aGvuakYTgc3kXyFLcF2UFEDk6c5CMZa29vj+7cubOkgD9NMJhugvPQ tm3bDjgxlkgkRgI2A1wTiMgrTv8nyWSy5NGVW4ztQp5Y1Njc3Lw1mUzeZVmWowhOy7Ke37Jlyz/c UTinUJ2dne912lhErJp9DNH4Tz6ffzQSiQwDCI+XkbwUwKVKOZtbV0rdAOCL7iicU4SVUo+U0f6I Xg3RVIxt27YdsCxro5s2RUQPXX1COwtNRenv779RRHb4rUNTPtpZaCrKzp07R9Lp9GUicimA58ZW mzRVSMiyrPMnFuTz+QNl2FttWdbRjE4kXyjDVkmIyBdE5Gh4t1LqFa/6rgCTrqOION6Xks/nO5VS 0Qm2essV54R0On0fgPva29ujzc3Np4iIo2Q4lmU977K02fiUZVkTs4sdLKe9l9/JkZGRlFKqyy17 IuJbSkaNRqPRaDQajUaj0Wg0mtlg Jm4OFq0l3NvWM+BbjHtXS8M7aKhfF60o+FVbT/bo2SEPH2Oe psJ4rKLiyoCAQPi8AM+IWH9UIn8cysvTK/sHXYlQ3BVFTNU3rlJKXSSQNwE8lpB5AngSq0BABHwV kG4I/kmRB4fJH6/oyf7PDfuZpvo3SthYTYWlEL4BwLGgBOqYgbyVP21F75EpG7gycXMvRo/dqBpC BOuKVRJK0TqVxBKokA2dgEw6W4Nh0M7f5yvEyQROJtWlABAxgEzMfFBGuGHpwYH9TkzuAuqM1sYN VNwAsH60m3H/QG88xdHeUA8wBmIxyJVhke9mWs1b+5n96gd74GiPyK4oYqEG80YAHUezcR39o4IV sxUSmT48QVBHBvy7WUBNxVkIMGkNX4ZRlWv6JFcqQ57qam3sLLVtZn7DglA8uo9KbRx3FIGCDFPx c80092daIiXvguyK1b/baIj+GeS6oKWiqnVqylnUFGRIKZXOxEzb+yAeiNWdBEP9FkCQcj/OAI+H Efl1V9y0PRTPxBqXKRoZEsdUUplmemrLWXDySMJCdY4sCvj6w8eYdtL3M8LQdpILilcNBgRiSnjP HRM2ms3ErihihLobCE6e17lGbTmLGoSkYYR4W7F6u2PmFQTP8UKTqxCnnNBqfrJYtVCDeSMIX85q 1YxSU86CBSOJEFgLIwuAOK8rbq6d6eNd8/EaATw/x9QtSF73UMw8bqbPH57f8E6MnhKn8ZGacha1 DIVfmukzQ5nXkpzxZgs6JOaFBd+e7rMdgGEY6jY9mek/NeUspqyGsCbmLMaQk3fMlPyVvNJjMe5D fCQDTNlc1hRvOAfk2/2Q5AYWa2R0ixpO2FsifeXs7HQKCSWCxSSLOm2Sqqm1cRF6c09MLH+ouf4E EvPs9CciIyD2Q7xzogQWgyz+PSOZb208Bb25P0wsFouLil+dsbqQLAR/cyS0UuR5pJzmIhKYzPK1 5iwKVkOGRCEyU92JjX7Y1pP9 aMVUzUKmJfIWMSJbCLyzaGXyVACTnIURUqfa6UeAPUPIX3FR9xFP T1Z7sKn+TZE6IwXwgmJ1Q+RiAJOcBUfLbCD3jOSyVy0fgG+HQVWCtp7s2/zWME5NPYaUgW/Xoa1v 6Dla1p02q795SsmoAykKLevOi3q8dRQAsLJ/8B8i1vft1BWZNj7EVszIsCXfqTVHETRqy1kUDK8t m3MWFH9jhPO0vX9lSvIUEracRQl9uM6g8Hd26iliyiiCmFo2FTn8eG/uqdKVaUqhtpyFQwT+JoEV gWGrHjEl8xgFMVttwRdL1eUWq3pztjKmCac5c4YYKdoOUIv0d7ni1NQFLoyzCNuP4PTVWYQUzrZT T/KWnye5+4IIni1Wh2BddH7DGV7omcvUlLNwivh4Hbri5ukUritaUeSFvQcP7/VAUqAgYWvnrWGo rzwQqzup0nrmMrZWQyg4Y3fcdCUHgRMEDI8dQioELAAihAWAFFAARUAJJi99WFY4YtgY4Cvwkkws Wnw1wmUIKIicaCfgSIAfbhz92+cUIvKsnXgskssiElqyOx7yJCGxCIYAdBP4nyV4RPIj9y07NHjA 7X78vO/G+MWS7uwawO7SKRkGcGwlFc3a/agGcPSlOlo29uJopgaZPEIwQjZHDEQTgSZXxJaMjScg waF8FYdzl4Ul++3N6Izuo4FH39Mx/7UAABSxApHQTbtj0R8ND+c/s+LQ4L9c7Mm3+w4AIDJ//GWt xVnUJCLW1St6c2X9wihYJ2ZaIlW3Eaut7/BjmXh0j604FL8hVocjxrKuuHnl0u7sdr/luI12FkFH 8K223lyqXDMGjd/AzjNZ8JARsT5ugI+PjRwCDhuUyJ2ZeOO8tu7cJr/VuIme4AwwYslNS3oGvuy3 Dr9Z3pN7UiC2ArsCAUlC3ZaJN7zLbyluop1FgKHiuodbzKJh0nOBw8O5awTVFaFJUbciaElBy0A7 i2DTohQymVjjer+F+M0l h3AIlrUMQJ/fWmxDnrU7Zl7htwy30M4i4JA0QG7KtDae6bcWv2nrzT1h 5fEeAK4cleAFAly/I4Zo8ZrBRzuLKoBgBFT3PgAE6kwMP1h6cGB/vntgkYh1LcTZUQJeQvK4Jpgf 8FuHG9haDRHIEAHf9hbI6BkLlcsEJRgAxZfhrYCNRPH9HSROrGsxV6Mv+wMvdAWZ5cAR9OS+sQO4 ubmlYSmUsVwoCwG8lvDoV1zYAtrsS+xshpuxsYsxGw56B14af2136fTJJd3Zcyukpyi75jecGwoZ eyplX4i72rr9yWexEVDntJqXGeTt4OyBYaLwYQBz3lmM80HgMPoO3w/gfq/73jUfrzGUeQ0VP1+s Lun8aIYl3dmFTtu6jX4M8ZmNgLWsN3uPEI/YqH6hfhQJBssP4pUXerNfgchwsboyzdb7akQHZQUE QvYAvHjWOqQRaYkcj76h50ruQGSHAIcdCywTkjWzKjDOOmAwAzxDYNbJZwpOyABmG5D1Slsl0M4i KFjI2xrnSXgBULqzGAaucutAYifsjkdrzlkAAIh88TrkYCsUPNniVjn0Y0hAENLW3gcxqI/uCwhj J6nZyJEpz6/qxasVF1RhtLMIAF2t0fNJvNdOXQtzLwFOELkDCC+Mm1cRxU9Ct5PApxrQjyEAALkk Ezd9yaJMcB5sJqUVkZGXenJ/qrCkQJKJmz8F7B154AUUvAHg623VtZnAZzoycfP3Ttu6CQV92lkA IBgHEPdbR3H4t3XAoN8q/IDCs4stLXtKCTs+RMTxyCIw59dSXtKPIVUEEZwDZzS26RseynkeB1IJ tLOoFkTymKvZsqoZwXUr+/Gy3zLcQDuLKkEEtyzpyeqzMaqLZ3/XM3CH3yLcQjuLKkAgB4Z6s9f5 rUNTKvLpjbARh1El6AnOoCMYAEauuAjI+S1FUxJfW9Kd3e23CDfRziLAiMiLI5AVy3sGn/Rbi8Ye ImKBuLqtO3uT31rc Rj+GBBCBHAHk5uGh7OLlPTntKKoEEfx2BHJWLToKQI8s/EdkGMRzAjwD4GkC T2cPZ59Y/WoVpY+bg4zneBHhfwH5lWXJ/cv6co/7rauS/B/ne3S/hgBqfAAAAABJRU5ErkJggg== " - height="15.675" - width="63.412498" /> - </g> - <g - inkscape:groupmode="layer" - id="layer2" - inkscape:label="BADGE" - style="display:none" - sodipodi:insensitive="true"> - <g - style="display:inline" - transform="translate(-340.00001,-581)" - id="g4394" - clip-path="none"> - <g - id="g855"> - <g - inkscape:groupmode="maskhelper" - id="g870" - clip-path="url(#clipPath873)" - style="opacity:0.6;filter:url(#filter891)"> - <path - transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)" - d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" - sodipodi:ry="12" - sodipodi:rx="12" - sodipodi:cy="552.36218" - sodipodi:cx="252" - id="path844" - style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - </g> - <g - id="g862"> - <path - sodipodi:type="arc" - style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path4398" - sodipodi:cx="252" - sodipodi:cy="552.36218" - sodipodi:rx="12" - sodipodi:ry="12" - d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" - transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" /> - <path - transform="matrix(1.25,0,0,1.25,33,-100.45273)" - d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" - sodipodi:ry="12" - sodipodi:rx="12" - sodipodi:cy="552.36218" - sodipodi:cx="252" - id="path4400" - style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - <path - sodipodi:type="star" - style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path4459" - sodipodi:sides="5" - sodipodi:cx="666.19574" - sodipodi:cy="589.50385" - sodipodi:r1="7.2431178" - sodipodi:r2="4.3458705" - sodipodi:arg1="1.0471976" - sodipodi:arg2="1.6755161" - inkscape:flatsided="false" - inkscape:rounded="0.1" - inkscape:randomized="0" - d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z" - transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" /> - </g> - </g> +<svg xmlns="http://www.w3.org/2000/svg"; height="100px" width="100px" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink"; viewBox="0 0 100 100"><!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch --> + <title>hbase</title> + <desc>Created with Sketch.</desc> + <defs> + <circle id="path-1" cy="50" cx="50" r="50"/> + </defs> + <g id="Page-1" fill-rule="evenodd" fill="none"> + <g id="hbase"> + <g id="orca"> + <mask id="mask-2" fill="white"> + <use xlink:href="#path-1"/> + </mask> + <use id="Oval-Copy" xlink:href="#path-1" transform="translate(50 50) rotate(180) translate(-50 -50)" fill="#FFFFFF"/> + <g id="Orca" fill="#000" mask="url(#mask-2)" fill-rule="nonzero"> + <g id="Shape" transform="translate(15 23)"> + <path d="m40.531 32.873c1.61 0-0.49 5.624-7.367 8.355s-11.9 0.975-12.973 0.732c-1.072-0.243-0.519-1.35 0.878-2.049 3.123-1.555 3.853-6.829 8.291-6.973 4.438-0.143 9.562-0.065 11.171-0.065m21.895-4.475c0.211 0.32 7.469 0.968 7.43 9.392 0 0.908-0.505 1.678-0.967 0.459s-1.536-1.096-2.268-1.683c-0.732-0.586-0.732-0.706-3.463-0.561-2.731 0.146-2.557-1.683-2.829-1.951-0.218 0.585-0.097 2.415-1.73 2.078-1.634-0.338-1.293 1.072-1.829 0.536-0.535-0.535-0.585 0.609-1.072 0.464s-1.146 0.487-1.119 1.024-0.463 1.22-0.877 0.553c-3.283-5.274 3.706-6.941 3.219-9.624 1.118 0.846 2.876 2.672 3.73 3.765 0.479 0.624 0.844 0.175 0.593-0.159-3.953-5.198-9.056-7.582-13.697-7.561-5.812 0.025-10.642 5.135-12.967 6.976-0.689 0.545-2.859 0.121-5.525 0.339-4.937 0.402-5.225 5.245-8.68 7.204-1.804 1.023-1.697 2.373-0.845 2.731s2.819 0.755 3.645 0.867c-4.341 4.975-10.548 6.982-12.327 8.206-2.1939 1.512-4.1916 3.503-6.9245 3.516-1.6589 0-1.8539-1.072-1.8539-1.072-0.4794-0.104-1.5198-1.26-1.3568-2.3s-0.98289 -3.65-0.39796-7.42c0.78306-5.041 3.7877-11.331 6.129-15.232 2.3573-3.929 7.8312-10.889 8.3392-11.558 1.582-2.091-2.877-14.338 2.958-17.087 0.83-0.3895 1.186-0.01553 1.186 0.52146 0 0.53694 0.655 11.165 5.413 10.779 2.194-0.179 12.453-2.4057 21.428 1.235 7.386 2.997 13.392 10.548 16.663 15.574m-44.889 7.277c-3.764 0.132-6.118 3.495-6.145 6.047-0.032 3.056 2.21 0.716 4.551-0.748s1.886-3.869 2.113-4.032 1.012-1.322-0.519-1.267m-5.81 8.583c-0.452 0.368-0.673 0.844-0.495 1.065 0.177 0.22 0.69 0.102 1.142-0.264 0.453-0.366 0.675-0.844 0.496-1.064-0.179-0.221-0.691-0.103-1.143 0.263m9.672-0.289c-1.438-0.129-2.627-0.673-3.602-1.234s-1.648 1.838-3.676 3.804c-2.178 2.113-5.1618 2.853-6.5666 4.902-1.1699 1.706-2.7521 2.114-3.6247 2.478-0.3772 0.16-0.2205 0.299-0.0575 0.32 1.1427 0.171 3.1148-0.742 5.3906-2.535 2.6022-2.049 9.4392-4.618 12.138-7.74m24.931-20.709c-1.328 0-0.754-0.844-0.226-1.008 2.654-0.825 6.371 0.032 8.858 1.56-1.17-2-5.705-5.115-12.24-3.609-6.535 1.505-7.315 8.291-10.436 11.4 12h1.652c1.825-1.903 4.847-4.685 7.555-6.007 2.237-1.093 5.979-2.137 11.826-0.138-1.633-2.096-4.863-2.216-6.998-2.21m21.459 12.72c0.358 0.553 0.703 0.16 0.439-0.593-0.305-0.869-1.199-4.13-5.479-5.462-3.675-1.146-3.055-0.472-2.373 0.569 0.357 0.541 1.664 1.724 1.758 2.529 0.088 0.739-0.769 0.977-1.355 0.654-0.841-0.463-2.004-2.284-3.308-3.294-0.274 1.426-3.9 4.315-3.719 5.792 0.121 1.001 0.84 0.537 1.011 0.134 0.16-0.369 0.571-0.812 1.062-0.799 1.535 0.024 3.407-0.222 3.835-1.293 0.46-1.134 0.98-0.402 1.146 0 0.48 1.146 1.862 0.774 3.983 0.735 2.284-0.041 2.64 0.491 2.992 1.033m-65.206-0.561c0.6185-1.691 2.5363-5.626 4.1936-7.868-1.106 0.098-1.6222-2.889-2.5843-2.015-2.5107 2.276-3.0237 7.006-1.6093 9.885"/> + </g> </g> + </g> </g> + </g> </svg> http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-packages/src/charm/hbase/layer-hbase/tests/01-basic-deployment.py ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/charm/hbase/layer-hbase/tests/01-basic-deployment.py b/bigtop-packages/src/charm/hbase/layer-hbase/tests/01-basic-deployment.py index 3bfc5f2..4873d10 100755 --- a/bigtop-packages/src/charm/hbase/layer-hbase/tests/01-basic-deployment.py +++ b/bigtop-packages/src/charm/hbase/layer-hbase/tests/01-basic-deployment.py @@ -27,7 +27,7 @@ class TestDeploy(unittest.TestCase): @classmethod def setUpClass(cls): cls.d = amulet.Deployment(series='xenial') - cls.d.add('hbase', 'cs:xenial/hbase') + cls.d.add('hbase') cls.d.setup(timeout=1800) cls.d.sentry.wait_for_messages({'hbase': re.compile('ready')}, timeout=1800) http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-packages/src/charm/hbase/layer-hbase/tests/02-smoke-test.py ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/charm/hbase/layer-hbase/tests/02-smoke-test.py b/bigtop-packages/src/charm/hbase/layer-hbase/tests/02-smoke-test.py index 5382542..b168315 100755 --- a/bigtop-packages/src/charm/hbase/layer-hbase/tests/02-smoke-test.py +++ b/bigtop-packages/src/charm/hbase/layer-hbase/tests/02-smoke-test.py @@ -27,11 +27,11 @@ class TestDeploy(unittest.TestCase): @classmethod def setUpClass(cls): cls.d = amulet.Deployment(series='xenial') - cls.d.add('hbase', 'cs:xenial/hbase') - cls.d.add('namenode', 'cs:xenial/hadoop-namenode') - cls.d.add('plugin', 'cs:xenial/hadoop-plugin') - cls.d.add('slave', 'cs:xenial/hadoop-slave') - cls.d.add('zookeeper', 'cs:xenial/zookeeper') + cls.d.add('hbase') + cls.d.add('namenode', charm='hadoop-namenode') + cls.d.add('plugin', charm='hadoop-plugin') + cls.d.add('slave', charm='hadoop-slave') + cls.d.add('zookeeper') cls.d.relate('hbase:hadoop', 'plugin:hadoop-plugin') cls.d.relate('hbase:zookeeper', 'zookeeper:zookeeper') http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-packages/src/charm/kafka/layer-kafka/icon.svg ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/charm/kafka/layer-kafka/icon.svg b/bigtop-packages/src/charm/kafka/layer-kafka/icon.svg index 1564f99..de5ab1b 100644 --- a/bigtop-packages/src/charm/kafka/layer-kafka/icon.svg +++ b/bigtop-packages/src/charm/kafka/layer-kafka/icon.svg @@ -1,90 +1,21 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; - width="75pt" - height="117pt" - viewBox="0 0 75 117" - version="1.1" - id="svg3201" - inkscape:version="0.48.4 r9939" - sodipodi:docname="icon.svg"> - <metadata - id="metadata3221"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs3219" /> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1236" - inkscape:window-height="847" - id="namedview3217" - showgrid="false" - inkscape:zoom="4.5641627" - inkscape:cx="35.369926" - inkscape:cy="80.60281" - inkscape:window-x="397" - inkscape:window-y="78" - inkscape:window-maximized="0" - inkscape:current-layer="layer1" /> - <path - d="m 0,0.04322 76.8,0 0,76.8 -76.8,0 0,-76.8 z" - id="path3203" - style="opacity:0;fill:#fffffe;fill-opacity:0.94977172" - inkscape:connector-curvature="0" /> - <path - d="M 13.76256,3.6403482 C 20.992,-0.05524154 33.024,1.9665021 36.42368,7.4934765 40.37632,12.889169 34.816,19.735528 25.77408,20.917066 c 0,1.732924 0.01024,3.459282 0,5.185642 4.6592,0.708923 8.87808,2.258051 12.05248,4.56205 2.21184,-0.892717 4.526079,-1.700102 6.72768,-2.605948 -0.59392,-3.209847 -0.59392,-6.833231 3.10272,-9.340718 5.77536,-4.719589 18.51392,-4.476718 23.72608,0.531692 4.751359,4.076308 3.266559,10.450051 -3.21536,13.403898 -6.03136,3.012923 -15.28832,2.271179 -20.41856,-1.266872 -2.16064,0.833641 -4.43392,1.549128 -6.52288,2.454975 -0.307201,1.122461 0.45056,2.251486 0.6144,3.373948 0.70656,1.956103 -0.78848,3.859693 -0.68608,5.809231 2.11968,0.951795 4.47488,1.68041 6.79936,2.415589 6.36928,-4.653948 19.445759,-3.918768 24.10496,1.575386 5.12,5.087179 0.62464,12.668717 -8.52992,14.211281 -6.85056,1.273436 -14.7968,-0.794256 -17.84832,-4.988717 -1.81248,-2.23836 -1.69984,-4.857437 -0.8704,-7.259898 -2.29376,-0.951795 -4.67968,-1.805128 -6.97344,-2.756923 - 3.16416,2.284307 -7.34208,3.885949 -12.01152,4.516102 -0.06144,1.746051 -0.04096,3.498667 -0.0512,5.251283 4.78208,0.728615 8.98048,2.921025 10.81344,5.868307 2.75456,4.299487 0.07168,9.872411 -6.51264,12.025436 -6.2464,2.422154 -15.06304,1.234052 -19.33312,-2.546872 -4.89472,-3.846564 -3.84,-10.095589 2.17088,-13.213539 1.91488,-1.102768 4.41344,-1.634461 6.78912,-2.19241 0.03072,-1.68041 0.04096,-3.367384 0.07168,-5.047794 C 14.98112,50.009169 10.21952,48.597887 7.26016,45.919734 1.44384,41.180451 2.2528,33.671118 9.20576,29.581682 c 2.78528,-1.93641 6.77888,-2.776616 10.567679,-3.577436 -0.03072,-1.68041 -0.04096,-3.360821 -0.07168,-5.034667 C 15.59552,20.181887 11.60192,18.678708 9.5641599,16.164655 5.82656,12.081784 7.69024,6.3644508 13.76256,3.6403482 z" - id="path3205" - inkscape:connector-curvature="0" - style="fill:#201f1f" /> - <path - d="M 18.95424,7.4869124 C 23.58272,5.3338867 30.53568,8.2614765 29.85984,11.799528 29.48096,14.924041 23.5008,17.182092 19.2,15.462297 14.42816,13.926297 14.27456,9.1410662 18.95424,7.4869124 z" - id="path3207" - inkscape:connector-curvature="0" - style="fill:#fffffe" /> - <path - d="m 55.76704,20.844861 c 4.51584,-1.673846 10.91584,0.761436 10.56768,4.135384 0.235519,3.649642 -7.33184,5.96677 -11.64288,3.557744 -4.106241,-1.897025 -3.38944,-6.255589 1.0752,-7.693128 z" - id="path3209" - inkscape:connector-curvature="0" - style="fill:#fffffe" /> - <path - d="m 18.78016,32.305784 c 7.311359,-2.303999 16.35328,2.829129 13.8752,7.75877 -1.44384,4.555487 -11.17184,6.721641 -16.5376,3.472409 -6.05184,-2.894768 -4.352,-9.570461 2.6624,-11.231179 z" - id="path3211" - inkscape:connector-curvature="0" - style="fill:#fffffe" /> - <path - d="m 54.69184,48.348451 c 4.66944,-2.619077 12.759039,0.347897 11.601919,4.253538 -0.409599,3.629949 -8.345599,5.218462 -12.103679,2.651898 -3.2256,-1.772308 -2.8672,-5.303795 0.50176,-6.905436 z" - id="path3213" - inkscape:connector-curvature="0" - style="fill:#fffffe" /> - <path - d="m 20.67456,61.030297 c 5.10976,-1.13559 10.78272,2.566565 8.82688,5.809231 -1.269761,3.190153 -8.48896,4.483282 -11.84768,1.857641 -4.06528,-2.19241 -2.03776,-6.872615 3.0208,-7.666872 z" - id="path3215" - inkscape:connector-curvature="0" - style="fill:#fffffe" /> - <g - inkscape:groupmode="layer" - id="layer1" - inkscape:label="Alpha" - style="opacity:1" /> +<svg xmlns="http://www.w3.org/2000/svg"; height="100px" width="100px" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink"; viewBox="0 0 100 100"><!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch --> + <title>kafka</title> + <desc>Created with Sketch.</desc> + <g id="Page-1" fill-rule="evenodd" fill="none"> + <g id="kafka"> + <path id="path4784" fill-rule="nonzero" fill="#fff" d="m50 1.1369e-13c-27.614-1.69e-15 -50 22.386-50 50-3.3818e-15 27.614 22.386 50 50 50 13.261 0 25.979-5.268 35.355-14.645 9.377-9.376 14.645-22.094 14.645-35.355 0-27.614-22.386-50-50-50z"/> + <g id="kafta" fill="#000" transform="translate(27 13)"> + <path id="Combined-Shape" d="m13.333 20c-5.5225 0-9.9997-4.477-9.9997-10 0-5.5228 4.4772-10 9.9997-10 5.523 0 10 4.4772 10 10 0 5.523-4.477 10-10 10zm0.278-5c2.608 0 4.722-2.114 4.722-4.722 0-2.6082-2.114-4.7224-4.722-4.7224s-4.7221 2.1142-4.7221 4.7224c0 2.608 2.1141 4.722 4.7221 4.722z"/> + <rect id="Rectangle" y="18.889" x="11.111" height="6.6667" width="4.4444"/> + <rect id="Rectangle-Copy" y="49.444" x="11.111" height="6.6667" width="4.4444"/> + <rect id="Rectangle-Copy-2" transform="translate(26.776 29.702) rotate(60) translate(-26.776 -29.702)" height="6.6667" width="4.4444" y="26.369" x="24.553"/> + <rect id="Rectangle-Copy-3" transform="translate(26.22 45.258) scale(1 -1) rotate(60) translate(-26.22 -45.258)" height="6.6667" width="4.4444" y="41.925" x="23.998"/> + <path id="Combined-Shape-Copy-4" d="m12.778 50c-7.0572 0-12.778-5.721-12.778-12.778s5.7208-12.778 12.778-12.778c7.057 0 12.778 5.721 12.778 12.778s-5.721 12.778-12.778 12.778zm0.355-6.389c3.332 0 6.034-2.701 6.034-6.034 0-3.332-2.702-6.034-6.034-6.034-3.3327 0-6.0342 2.702-6.0342 6.034 0 3.333 2.7015 6.034 6.0342 6.034z"/> + <path id="Combined-Shape-Copy" d="m13.333 75c-5.5225 0-9.9997-4.477-9.9997-10s4.4772-10 9.9997-10c5.523 0 10 4.477 10 10s-4.477 10-10 10zm0.278-5c2.608 0 4.722-2.114 4.722-4.722s-2.114-4.722-4.722-4.722-4.7221 2.114-4.7221 4.722 2.1141 4.722 4.7221 4.722z"/> + <path id="Combined-Shape-Copy-2" d="m36.667 33.889c-5.523 0-10-4.477-10-10s4.477-10 10-10 10 4.477 10 10-4.477 10-10 10zm0.277-5c2.608 0 4.723-2.114 4.723-4.722s-2.115-4.723-4.723-4.723-4.722 2.115-4.722 4.723 2.114 4.722 4.722 4.722z"/> + <path id="Combined-Shape-Copy-3" d="m36.667 61.111c-5.523 0-10-4.477-10-10s4.477-10 10-10 10 4.477 10 10-4.477 10-10 10zm0.277-5c2.608 0 4.723-2.114 4.723-4.722s-2.115-4.722-4.723-4.722-4.722 2.114-4.722 4.722 2.114 4.722 4.722 4.722z"/> + </g> + </g> + </g> </svg> http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-packages/src/charm/kafka/layer-kafka/tests/01-deploy.py ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/charm/kafka/layer-kafka/tests/01-deploy.py b/bigtop-packages/src/charm/kafka/layer-kafka/tests/01-deploy.py index f8f0679..f6d5487 100755 --- a/bigtop-packages/src/charm/kafka/layer-kafka/tests/01-deploy.py +++ b/bigtop-packages/src/charm/kafka/layer-kafka/tests/01-deploy.py @@ -26,8 +26,8 @@ class TestDeploy(unittest.TestCase): @classmethod def setUpClass(cls): cls.d = amulet.Deployment(series='xenial') - cls.d.add('kafka', charm='cs:xenial/kafka') - cls.d.add('zookeeper', charm='cs:xenial/zookeeper') + cls.d.add('kafka') + cls.d.add('zookeeper') cls.d.relate('kafka:zookeeper', 'zookeeper:zookeeper') http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-packages/src/charm/kafka/layer-kafka/tests/02-smoke-test.py ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/charm/kafka/layer-kafka/tests/02-smoke-test.py b/bigtop-packages/src/charm/kafka/layer-kafka/tests/02-smoke-test.py index c688c69..65c86ed 100755 --- a/bigtop-packages/src/charm/kafka/layer-kafka/tests/02-smoke-test.py +++ b/bigtop-packages/src/charm/kafka/layer-kafka/tests/02-smoke-test.py @@ -26,8 +26,8 @@ class TestDeploy(unittest.TestCase): @classmethod def setUpClass(cls): cls.d = amulet.Deployment(series='xenial') - cls.d.add('kafka', charm='cs:xenial/kafka') - cls.d.add('zookeeper', charm='cs:xenial/zookeeper') + cls.d.add('kafka') + cls.d.add('zookeeper') cls.d.relate('kafka:zookeeper', 'zookeeper:zookeeper') http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-packages/src/charm/kafka/layer-kafka/tests/10-config-changed.py ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/charm/kafka/layer-kafka/tests/10-config-changed.py b/bigtop-packages/src/charm/kafka/layer-kafka/tests/10-config-changed.py index a27f783..d5f3723 100755 --- a/bigtop-packages/src/charm/kafka/layer-kafka/tests/10-config-changed.py +++ b/bigtop-packages/src/charm/kafka/layer-kafka/tests/10-config-changed.py @@ -29,10 +29,10 @@ class TestConfigChanged(unittest.TestCase): @classmethod def setUpClass(cls): cls.d = amulet.Deployment(series='xenial') - cls.d.add('kafka-test', charm='cs:xenial/kafka') - cls.d.add('zk-test', charm='cs:xenial/zookeeper') + cls.d.add('kafka-test', charm='kafka') + cls.d.add('kafka-test-zk', charm='zookeeper') - cls.d.relate('kafka-test:zookeeper', 'zk-test:zookeeper') + cls.d.relate('kafka-test:zookeeper', 'kafka-test-zk:zookeeper') cls.d.setup(timeout=1800) cls.d.sentry.wait_for_messages({'kafka-test': 'ready'}, timeout=1800) @@ -42,10 +42,10 @@ class TestConfigChanged(unittest.TestCase): def tearDownClass(cls): # NB: seems to be a remove_service issue with amulet. However, the # unit does still get removed. Pass OSError for now: - # OSError: juju command failed ['remove-application', 'zk-test']: - # ERROR allocation for service ...zk-test... owned by ... not found + # OSError: juju command failed ['remove-application', ...]: + # ERROR allocation for service ... owned by ... not found try: - cls.d.remove_service('zk-test', 'kafka-test') + cls.d.remove_service('kafka-test', 'kafka-test-zk') except OSError as e: print("IGNORE: Amulet remove_service failed: {}".format(e)) pass http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-packages/src/charm/mahout/layer-mahout/tests/01-mahout-test.py ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/charm/mahout/layer-mahout/tests/01-mahout-test.py b/bigtop-packages/src/charm/mahout/layer-mahout/tests/01-mahout-test.py index 4e315d3..3dd679e 100755 --- a/bigtop-packages/src/charm/mahout/layer-mahout/tests/01-mahout-test.py +++ b/bigtop-packages/src/charm/mahout/layer-mahout/tests/01-mahout-test.py @@ -26,12 +26,12 @@ class TestDeploy(unittest.TestCase): @classmethod def setUpClass(cls): cls.d = amulet.Deployment(series='xenial') - cls.d.add('mahout', 'cs:xenial/mahout') - cls.d.add('client', 'cs:xenial/hadoop-client') - cls.d.add('resourcemanager', 'cs:xenial/hadoop-resourcemanager') - cls.d.add('namenode', 'cs:xenial/hadoop-namenode') - cls.d.add('slave', 'cs:xenial/hadoop-slave') - cls.d.add('plugin', 'cs:xenial/hadoop-plugin') + cls.d.add('mahout') + cls.d.add('client', charm='hadoop-client') + cls.d.add('namenode', charm='hadoop-namenode') + cls.d.add('resourcemanager', charm='hadoop-resourcemanager') + cls.d.add('slave', charm='hadoop-slave') + cls.d.add('plugin', charm='hadoop-plugin') cls.d.relate('plugin:hadoop-plugin', 'client:hadoop') cls.d.relate('plugin:namenode', 'namenode:namenode') http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a715b04/bigtop-packages/src/charm/pig/layer-pig/tests/01-deploy.py ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/charm/pig/layer-pig/tests/01-deploy.py b/bigtop-packages/src/charm/pig/layer-pig/tests/01-deploy.py index 53364c1..b7e8620 100755 --- a/bigtop-packages/src/charm/pig/layer-pig/tests/01-deploy.py +++ b/bigtop-packages/src/charm/pig/layer-pig/tests/01-deploy.py @@ -27,7 +27,7 @@ class TestDeploy(unittest.TestCase): @classmethod def setUpClass(cls): cls.d = amulet.Deployment(series='xenial') - cls.d.add('pig', 'cs:xenial/pig') + cls.d.add('pig') cls.d.setup(timeout=1800) cls.d.sentry.wait_for_messages({'pig': re.compile('ready')}, timeout=1800)
