From 3fd2b6a0a4b86b13e44dd391dad8a80a4227f791 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Wed, 20 Jul 2016 22:18:01 +0000
Subject: [PATCH] Add .gitreview and clean up repo

Add src/README.md placeholder to prevent inheritence of the
base layer's readme file in the built charm.

Use the official charms.openstack repo in test-requirements.txt.

Use official designate-bind charm location in the Amulet tests.

Remove upload-and-publish so as not to encourage out-of-band
pushing and publishing.  That is handled by CI.

Fix a test filename typo.

Add tests readme.

Update tox.ini for Amulet environment variables.

Update metadata.yaml, removing EOL release and adding tags.

Fix unit tests

Change-Id: If842a5409c2d284bc118d70d6e8caba7cb6205c3
---
 .gitreview                                    |   4 +++
 README.md                                     |  22 +++++++++++++++
 src/README.md                                 |   1 +
 src/lib/charm/__init__.pyc                    | Bin 0 -> 112 bytes
 src/lib/charm/openstack/__init__.pyc          | Bin 0 -> 122 bytes
 src/lib/charm/openstack/designate.pyc         | Bin 0 -> 21812 bytes
 src/metadata.yaml                             |   4 ++-
 src/reactive/designate_utils.py               |  16 ++++++-----
 src/tests/README.md                           |   9 +++++++
 src/tests/basic_deployment.py                 |   3 +--
 src/tests/dev-basic-xenial-newton             |  25 ++++++++++++++++++
 src/tests/dev-basic-yakkety-newton            |  23 ++++++++++++++++
 ...trusty-mitaka => gate-basic-trusty-mitaka} |   0
 src/tox.ini                                   |   1 +
 test-requirements.txt                         |   2 +-
 tox.ini                                       |   6 ++---
 unit_tests/__init__.py                        |   2 ++
 unit_tests/__init__.pyc                       | Bin 1290 -> 2086 bytes
 unit_tests/test_designate_handlers.py         |   4 +++
 unit_tests/test_designate_handlers.pyc        | Bin 6567 -> 10472 bytes
 unit_tests/test_designate_utils.py            |   9 +++++--
 unit_tests/test_designate_utils.pyc           | Bin 0 -> 7078 bytes
 .../test_lib_charm_openstack_designate.py     |   2 +-
 .../test_lib_charm_openstack_designate.pyc    | Bin 0 -> 19910 bytes
 upload-and-publish                            |  13 ---------
 25 files changed, 117 insertions(+), 29 deletions(-)
 create mode 100644 .gitreview
 create mode 100644 README.md
 create mode 100644 src/README.md
 create mode 100644 src/lib/charm/__init__.pyc
 create mode 100644 src/lib/charm/openstack/__init__.pyc
 create mode 100644 src/lib/charm/openstack/designate.pyc
 create mode 100644 src/tests/README.md
 create mode 100755 src/tests/dev-basic-xenial-newton
 create mode 100755 src/tests/dev-basic-yakkety-newton
 rename src/tests/{bate-basic-trusty-mitaka => gate-basic-trusty-mitaka} (100%)
 create mode 100644 unit_tests/test_designate_utils.pyc
 create mode 100644 unit_tests/test_lib_charm_openstack_designate.pyc
 delete mode 100755 upload-and-publish

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..28fc2e8
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=openstack/charm-designate.git
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..fadc4f6
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+# Overview
+
+This is a "source" charm, which is intended to be strictly the top
+layer of a built charm.  This structure declares that any included
+layer assets are not intended to be consumed as a layer from a
+functional or design standpoint.
+
+# Test and Build
+
+Building, pushing and publishing to the charm store is automated
+by CI to ensure consistent flow.  Manually building is useful for
+development and testing, however.
+
+```
+tox -e pep8
+tox -e py34  # or py27 or py35
+tox -e build
+```
+
+# Contact Information
+
+Freenode IRC: #openstack-charms
diff --git a/src/README.md b/src/README.md
new file mode 100644
index 0000000..02b5ef0
--- /dev/null
+++ b/src/README.md
@@ -0,0 +1 @@
+# Write me.
diff --git a/src/lib/charm/__init__.pyc b/src/lib/charm/__init__.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e6f48b15dbd984e6c2ed90606a3fd3e76e01eef1
GIT binary patch
literal 112
zcmZSn%**xdOMiGW0~9a<X$K%KW&si@3=F{<AQ3+eAi;n}6iWidii?u<b25|klQR;F
ja`ofmGxIV_;^XxSDoZ$kvNpN-DWy57b|5o~ftUdRCm<A|

literal 0
HcmV?d00001

diff --git a/src/lib/charm/openstack/__init__.pyc b/src/lib/charm/openstack/__init__.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f21b12bab37b6b9244c9918250b4c10fee958987
GIT binary patch
literal 122
zcmZSn%**xdOMiGW0~9a<X$K%KW&si@3=F{<AQ3+eAi;n}6e|P8ii?u<b25|klQR;F
ta`p2IQuB&S5|gv_<Kr{)GE3s)^$IFWIDqPGa`RJ4b5iX<rWFG*0{}my7@`0G

literal 0
HcmV?d00001

diff --git a/src/lib/charm/openstack/designate.pyc b/src/lib/charm/openstack/designate.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..04491c4b2f26bf46e111170ee96e8ecaaeb4e6f6
GIT binary patch
literal 21812
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
B2B!c3

literal 0
HcmV?d00001

diff --git a/src/metadata.yaml b/src/metadata.yaml
index 724ea2c..230049b 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -8,9 +8,11 @@ description: |
  * Integrated with Keystone for authentication
  * Framework in place to integrate with Nova and Neutron notifications
  * Support for PowerDNS and Bind9 out of the box
+tags:
+  - openstack
+  - dns
 series:
  - trusty
- - wily
  - xenial
 subordinate: false
 provides:
diff --git a/src/reactive/designate_utils.py b/src/reactive/designate_utils.py
index 12b35de..ca2d20b 100755
--- a/src/reactive/designate_utils.py
+++ b/src/reactive/designate_utils.py
@@ -19,6 +19,10 @@ import os
 import subprocess
 
 
+def display(msg):
+    print(msg)
+
+
 def run_command(cmd):
     os_env = get_environment(os.environ.copy())
     p = subprocess.Popen(cmd, env=os_env, stdout=subprocess.PIPE,
@@ -48,7 +52,7 @@ def get_server_id(server_name):
 def display_server_id(server_name):
     server_id = get_server_id(server_name)
     if server_id:
-        print(server_id)
+        display(server_id)
 
 
 def get_domain_id(domain_name):
@@ -60,7 +64,7 @@ def get_domain_id(domain_name):
 def display_domain_id(domain_name):
     domain_id = get_domain_id(domain_name)
     if domain_id:
-        print(domain_id)
+        display(domain_id)
 
 
 def create_server(server_name):
@@ -73,7 +77,7 @@ def create_server(server_name):
         '-f', 'value',
     ]
     out, err = run_command(cmd)
-    print(get_server_id(server_name))
+    display(get_server_id(server_name))
 
 
 def create_domain(domain_name, domain_email):
@@ -87,7 +91,7 @@ def create_domain(domain_name, domain_email):
         '-f', 'value',
     ]
     out, err = run_command(cmd)
-    print(get_domain_id(domain_name))
+    display(get_domain_id(domain_name))
 
 
 def delete_domain(domain_name):
@@ -126,12 +130,12 @@ def get_servers():
 
 def display_domains():
     for domain in get_domains():
-        print(domain)
+        display(domain)
 
 
 def display_servers():
     for server in get_servers():
-        print(server)
+        display(server)
 
 
 if __name__ == '__main__':
diff --git a/src/tests/README.md b/src/tests/README.md
new file mode 100644
index 0000000..046be7f
--- /dev/null
+++ b/src/tests/README.md
@@ -0,0 +1,9 @@
+# Overview
+
+This directory provides Amulet tests to verify basic deployment functionality
+from the perspective of this charm, its requirements and its features, as
+exercised in a subset of the full OpenStack deployment test bundle topology.
+
+For full details on functional testing of OpenStack charms please refer to
+the [functional testing](http://docs.openstack.org/developer/charm-guide/testing.html#functional-testing)
+section of the OpenStack Charm Guide.
diff --git a/src/tests/basic_deployment.py b/src/tests/basic_deployment.py
index 776cb05..ec36252 100644
--- a/src/tests/basic_deployment.py
+++ b/src/tests/basic_deployment.py
@@ -63,8 +63,7 @@ class DesignateBasicDeployment(amulet_deployment.OpenStackAmuletDeployment):
         other_services = [{'name': 'mysql'},
                           {'name': 'rabbitmq-server'},
                           {'name': 'keystone'},
-                          {'name': 'designate-bind',
-                           'location': 'cs:~gnuoy/trusty/designate-bind-3'}]
+                          {'name': 'designate-bind'}]
         super(DesignateBasicDeployment, self)._add_services(this_service,
                                                             other_services)
 
diff --git a/src/tests/dev-basic-xenial-newton b/src/tests/dev-basic-xenial-newton
new file mode 100755
index 0000000..50244d8
--- /dev/null
+++ b/src/tests/dev-basic-xenial-newton
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 Canonical Ltd
+#
+# 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.
+
+"""Amulet tests on a basic designate deployment on xenial-newton."""
+
+from basic_deployment import DesignateBasicDeployment
+
+if __name__ == '__main__':
+    deployment = DesignateBasicDeployment(series='xenial',
+                                          openstack='cloud:xenial-newton',
+                                          source='cloud:xenial-updates/newton')
+    deployment.run_tests()
diff --git a/src/tests/dev-basic-yakkety-newton b/src/tests/dev-basic-yakkety-newton
new file mode 100755
index 0000000..8ff1cbd
--- /dev/null
+++ b/src/tests/dev-basic-yakkety-newton
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 Canonical Ltd
+#
+# 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.
+
+"""Amulet tests on a basic designate deployment on yakkety-newton."""
+
+from basic_deployment import DesignateBasicDeployment
+
+if __name__ == '__main__':
+    deployment = DesignateBasicDeployment(series='yakkety')
+    deployment.run_tests()
diff --git a/src/tests/bate-basic-trusty-mitaka b/src/tests/gate-basic-trusty-mitaka
similarity index 100%
rename from src/tests/bate-basic-trusty-mitaka
rename to src/tests/gate-basic-trusty-mitaka
diff --git a/src/tox.ini b/src/tox.ini
index 127dd33..4a6291e 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -7,6 +7,7 @@ envdir = .tox/py27
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          AMULET_SETUP_TIMEOUT=2700
+passenv = HOME TERM AMULET_HTTP_PROXY AMULET_OS_VIP
 deps = -r{toxinidir}/test-requirements.txt
 install_command =
   pip install --allow-unverified python-apt {opts} {packages}
diff --git a/test-requirements.txt b/test-requirements.txt
index 41b4231..9a0bed8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,4 +4,4 @@ os-testr>=0.4.1
 charms.reactive
 mock>=1.2
 coverage>=3.6
-git+https://github.com/gnuoy/charms.openstack.git@bug/general#egg=charms.openstack
+git+https://github.com/openstack/charms.openstack#egg=charms.openstack
diff --git a/tox.ini b/tox.ini
index 615ecfc..26da278 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,10 +27,10 @@ commands = {posargs}
 [testenv:pep8]
 commands = flake8 {posargs} src/reactive src/lib unit_tests
 
+# Disable py27 tests as this is a reactive python 3 charm. Once project
+# config has been updated this tox target can be removed
 [testenv:py27]
-basepython = python2.7
-deps = -r{toxinidir}/test-requirements.txt
-commands = ostestr {posargs}
+commands = /bin/true
 
 [testenv:py34]
 basepython = python3.4
diff --git a/unit_tests/__init__.py b/unit_tests/__init__.py
index 604856b..549fa02 100644
--- a/unit_tests/__init__.py
+++ b/unit_tests/__init__.py
@@ -20,7 +20,9 @@ sys.path.append('src/lib')
 
 # Mock out charmhelpers so that we can test without it.
 # also stops sideeffects from occuring.
+apt_pkg = mock.MagicMock()
 charmhelpers = mock.MagicMock()
+sys.modules['apt_pkg'] = apt_pkg
 sys.modules['charmhelpers'] = charmhelpers
 sys.modules['charmhelpers.core'] = charmhelpers.core
 sys.modules['charmhelpers.core.hookenv'] = charmhelpers.core.hookenv
diff --git a/unit_tests/__init__.pyc b/unit_tests/__init__.pyc
index 009b374214d1b92cf4f912f417761d0ba5ceec9c..55dd2fdc59680f83ebb3cf23df6fb7175f68007e 100644
GIT binary patch
literal 2086
zcmcIkOK;Oa5S~racS6z!p#=mNgvtR2dg4$aB*c*(!U3rl%eA-hI*x65CzMF#R0N#h
zfAIG}Tw!Ln>qKp;9x5DrGxO~?yR$R1Q~%Xk{qy_B`w-5bI{m+*PyZAE5xoLZfWt}_
za40|mBsECt5Y^yJfSBras|!dPa7K0uAn7IgB18??CnZ^O`hwGwWd|)*(29eWDrnU~
z%N4Zdpp^=0I%w5GEvK(JJ-Owe<_wgy9om{jtL1K0XvY!TGf=Yb(2hknoW5@LO{Z^E
zR$C6*oPm<t4&8$Nh?FiwUHDvs!#f};uG<iia0kvP0XrOHK`DB-yG=P$f9W|uPN6PC
zy=4D;sXD?Y$zdFnqgbYeEVW+00C-_uO1(1=_2N7q%It%_KX*2gWEx;ji+1M{;#{M?
zJ9lcFDU1RPu2>r7s7M1;*+6eyw$HFsNBY4P6JB1(Ok)rZ^`mPk-WXM?^^@y~GcL^u
zhjGcvB%b8uP(QqCxpRW23cYcWb1X58b>|`+rt0dW#(_)g<4bnA^{JwGVLH|*OGQiw
zxmFtV(Pf9%^ywB2R8XG*KGos0PL)+7<RD}MOZ;upr+N4aa4eYqh3EoKxezU#CJmL>
z=P;OczX6=mE8sg2kykv}r2&i$vKv7;(6~s#@PtLfK_(s>qJBYQFV07@H$EC?IPMJ;
z?)6MzKaHeTgDgOrqpI>zQq}c*U$NqQ#RTt>v0q9oCw`v!@?$6qR3xb^lcm4+oTfE<
z4`S+7pS|iY&|oq4#bE!_mFLfB7tK3^XxHq<tl=6B*?43Qq3C?8q#p%Z`jJe72`-aL
z$MSJf$UaBWnvwuFbC>t^kAtDK;p_2&*1eU6W^J~$m`>tNyMlK)<h$GrY@eEFllV~{
z4vkO*7@G<R3c9}$t`PHWFi_!JV)Qxu$bD^;N8^+tz+Q0YGT?ciGGUqSZ#dk8Onh9&
zF{J5bHuj;tD`wBCdmty@v<JgEzq-hUq6#x<Zmc;CT~cFQT{gR{y>MpcjjOso=gyeZ
ziNn}P)U8UK=FCVpOB`3kzKzw(HpzOAhNfuNI-=8Pik9ez&FV*Tty}BzNVw7J?WILg
G7ykfht_nB+

delta 278
zcmZ1`(8VRq{F#?4d3sfNG6NJa18D~!E-soVy+wtGA(eq4i;W?Li@_$9l_86VA&VC#
z#0?di_(9YbES|*;lj4P|=7$OKAqiy(z(n~$qLV!sm9&8-2*X5$;A({#vP58_!VESk
zj10jVB9l)sCNqjn7GM(JoW?YTkx4^zas^xL<R@(Hsv00)Ac$f^AXh&lKQ~oBCo?fu
lzoaNJGf#i=K6WEUjmaO`C4~eSg_*>d#6TpY01yf@0RShVGKK&E

diff --git a/unit_tests/test_designate_handlers.py b/unit_tests/test_designate_handlers.py
index f0bdb54..298f59a 100644
--- a/unit_tests/test_designate_handlers.py
+++ b/unit_tests/test_designate_handlers.py
@@ -228,16 +228,20 @@ class TestDesignateHandlers(unittest.TestCase):
         self.update_peers.assert_called_once_with(cluster)
 
     def test_render_all_configs(self):
+        self.patch(handlers.designate, 'update_pools')
         self.patch(handlers.designate, 'render_full_config')
         handlers.render_all_configs('arg1', 'arg2')
         self.render_full_config.assert_called_once_with(('arg1', 'arg2', ))
+        self.update_pools.assert_called_once_with()
 
     def test_render_all_configs_single_node(self):
         self.patch(handlers.designate, 'render_full_config')
         self.patch(handlers.designate, 'render_rndc_keys')
+        self.patch(handlers.designate, 'update_pools')
         handlers.render_all_configs_single_node('arg1', 'arg2')
         self.render_full_config.assert_called_once_with(('arg1', 'arg2', ))
         self.render_rndc_keys.assert_called_once_with()
+        self.update_pools.assert_called_once_with()
 
     def test_cluster_connected(self):
         hacluster = mock.MagicMock()
diff --git a/unit_tests/test_designate_handlers.pyc b/unit_tests/test_designate_handlers.pyc
index 5d70fdb75dbc8e1618482623b1d12dfc655bbd7f..86fc773a229c5e48503e41737b18fecf65de8a9b 100644
GIT binary patch
literal 10472
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

delta 2210
zcmb7FO>7%Q6n?Y2UV9z8c49k;EtE8E+O9y2lNRL=PzX&yr4p{#fXYu>ckNjx>%?}w
zyQxBD%R&~A9!inszzL}r)HBL~YpWi(P^sdGP){7Va6;nDd$Y6&B~GcVdHd%5%)EKu
zH{;*myL&pS{+W#5{QAcC(J>{r1OUagR>LW7xOSr$c(&Utiu;9GQCBV;;Ekw@2Y7F*
zC3ZtRRu|Zi$ZJcQwPGfAzSI6-gL8Hs>(d9gMJaY?aI#o1eje=I`7oXxymV3gFf`dS
zun$oj%S#OWhp4z3@Dy+b=6M>phM!^JI(|lg$6>z9z-7QQz!Nx8VCx$Q06Gk63Iq%~
z3Ms1!oW0zIOA2&V=xVUlgpLYz1^R%FtI`pHt`40ZKwX7S1UeejHS(|P&}YC_aZw$E
zv(Sw~Cki|Xd434;R}^U9f^G~tn2BjI2yhvVmdImXUjf#(;bQw7T;u>NW)_cB@(-c3
z8|`Z|)mF3VR0D?xWbz&HFzE_6dH$s!fpgDka>pzC!Dg-Ir_fMcv%SWQ=%<cGT%3YP
zr9akGQZNT6dTuw$ZTf+|vEgttDt;SY$YEW$L(9X>OzN_Agz{b+`Cu?$;@6RhsR;}N
zO=VH}1MEdyQCVC~usq8vd1Xp0XSTC@%6q!8c$9fXKTTV`Az1b>TN1Yl;|K0$h}+pT
zYl=JBNnIrdcw&9}NY7P>09-}Xkqr@;zX|XqKn;P{;R{4Y_P(q`fT$uo*mo=wKlK>Y
z4d4hDrpJgreNdPLf?80LJwXg=?rIQ0!=~?ebN&!&o?WT9!AUX%J?h-`wU!^u`4X1U
zCoNTmJ{k&+43!*1Wn0#iUopv3GEsn3k&ysfp-TIC&b5tCrQ2V^>3<#o?)dI%Q~X$X
zd4`sKeZy{4xV?zy1s?|lWThILcEgb;kVTns(aw$ahzr&@h0%>#Yqi#$=5^~WGSCry
zmpf&rRzv<-MKTfvJ*U0t_(9pORvq8BmeFL=(Ii^}4K?EJ?uo2-(6oQ?^7U%uQ}dKj
zriCeV1O>1J%P^u;T*<K{&SV>DAKF18|M`m{PZYo#kN6`)5bqfDRbT`7fMmd^Fl3hu
zVQ1(z@yeX+EbrNYU9o*fHjr0BdL$|0ABQB!i*dj@hxw8MvUjqT`!|p~;z8l$kaZpt
zwsH6%{u({rGvlaR1eWzKiKj4IC7Kex)&&x?C<5Yn$nZ_ic?M7GeRTdWEJGsNfm7TR
zKNXJQzkn{%<3qEb;Q~IrY5#_F6hSpYP>J!>(`C9FuZsIqlSk#{ln*U|g|9GPRtW>e
zm8?0G;?a1nKsRL1>E5I%Ij!aAJS2_$SmG-T^y%UP%ZRHJIdO05%u2{``KX3H@k2^`
zt8-73Qz6|i(>_;Fn6$>TRh%N*B@)jm<-{-s1$3eIzU2aqPikXnRx(rK-to83EYgB!
zNmwL4BJl}{GKvr;R6=ck#^9AJPFqCK!#Mm=6uOccPNfXZh$do2-iR6rBWXm$FDJe|
K;3a-w9{U>!64Sr{

diff --git a/unit_tests/test_designate_utils.py b/unit_tests/test_designate_utils.py
index 02010de..a5072cf 100644
--- a/unit_tests/test_designate_utils.py
+++ b/unit_tests/test_designate_utils.py
@@ -90,24 +90,27 @@ class TestDesignateUtils(unittest.TestCase):
     def test_create_server(self):
         _server_ids = ['servid1', None]
         self.patch(dutils, 'get_server_id')
+        self.patch(dutils, 'display')
         self.get_server_id.side_effect = lambda x: _server_ids.pop()
         self.patch(dutils, 'run_command')
         self.run_command.return_value = ('out', 'err')
-        self.assertEqual(dutils.create_server('server1'), 'servid1')
+        dutils.create_server('server1')
         cmd = [
             'designate', 'server-create',
             '--name', 'server1',
             '-f', 'value',
         ]
         self.run_command.assert_called_with(cmd)
+        self.display.assert_called_with('servid1')
 
     def test_create_domain(self):
         _domain_ids = ['domainid1', None]
         self.patch(dutils, 'get_domain_id')
+        self.patch(dutils, 'display')
         self.get_domain_id.side_effect = lambda x: _domain_ids.pop()
         self.patch(dutils, 'run_command')
         self.run_command.return_value = ('out', 'err')
-        self.assertEqual(dutils.create_domain('dom1', 'email1'), 'domainid1')
+        dutils.create_domain('dom1', 'email1')
         cmd = [
             'designate', 'domain-create',
             '--name', 'dom1',
@@ -115,8 +118,10 @@ class TestDesignateUtils(unittest.TestCase):
             '-f', 'value',
         ]
         self.run_command.assert_called_with(cmd)
+        self.display.assert_called_with('domainid1')
 
     def test_delete_domain(self):
+        self.patch(dutils, 'get_domain_id', return_value='dom1')
         self.patch(dutils, 'run_command')
         dutils.delete_domain('dom1')
         self.run_command.assert_called_with(['domain-delete', 'dom1'])
diff --git a/unit_tests/test_designate_utils.pyc b/unit_tests/test_designate_utils.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b6f79eee1e091f414dd83421807ba91d002abd23
GIT binary patch
literal 7078
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

literal 0
HcmV?d00001

diff --git a/unit_tests/test_lib_charm_openstack_designate.py b/unit_tests/test_lib_charm_openstack_designate.py
index 408946f..eddf410 100644
--- a/unit_tests/test_lib_charm_openstack_designate.py
+++ b/unit_tests/test_lib_charm_openstack_designate.py
@@ -203,7 +203,7 @@ class TestBindRNDCRelationAdapter(Helper):
 
     def test_rndc_info(self):
         relation = mock.MagicMock()
-        relation.rndc_info.return_value = 'rndcstuff'
+        relation.rndc_info = 'rndcstuff'
         a = designate.BindRNDCRelationAdapter(relation)
         self.assertEqual(a.rndc_info, 'rndcstuff')
 
diff --git a/unit_tests/test_lib_charm_openstack_designate.pyc b/unit_tests/test_lib_charm_openstack_designate.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0fac865ed58e4234a687d284cf84a5d6927c9813
GIT binary patch
literal 19910
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

literal 0
HcmV?d00001

diff --git a/upload-and-publish b/upload-and-publish
deleted file mode 100755
index 4f22450..0000000
--- a/upload-and-publish
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# NOTE: relies on new charm publishing features
-
-set -ex
-
-owner=${1:-openstack-charmers-next}
-
-echo "Publishing designate charm to charm store as $owner"
-
-charm upload build/trusty/designate ~${owner}/designate
-charm publish ~${owner}/designate
-charm change-perm --set-read everyone ~${owner}/designate