DDD implementation

Issue-ID: INT-676

Change-Id: I970eda81a081acab7401f0b213d6e675b5570871
Signed-off-by: Mariusz Wagner <mariusz.wagner@nokia.com>
diff --git a/plans/aaf/aafapi/setup.sh b/plans/aaf/aafapi/setup.sh
index add9ae1..dd6cb29 100644
--- a/plans/aaf/aafapi/setup.sh
+++ b/plans/aaf/aafapi/setup.sh
@@ -44,8 +44,7 @@
 for i in {1..12}; do
 
 	if [ $(docker inspect --format '{{ .State.Running }}' $aaf_service) ] && \
-		[ $(docker inspect --format '{{ .State.Running }}' $cassandra_service) ] && \
-		[ $(docker inspect --format '{{ .State.Running }}' $aaf_service) ]
+		[ $(docker inspect --format '{{ .State.Running }}' $cassandra_service) ]
 	then
 		echo "AAF Service Running"
 		break
diff --git a/plans/aaf/sms-test-plan/teardown.sh b/plans/aaf/sms-test-plan/teardown.sh
index 2c8b3e8..fa5c218 100644
--- a/plans/aaf/sms-test-plan/teardown.sh
+++ b/plans/aaf/sms-test-plan/teardown.sh
@@ -15,11 +15,5 @@
 # limitations under the License.
 #
 
-docker cp sms:/sms/sms.log .
-cat sms.log
-rm sms.log
-rm -rf config
-docker stop sms vault
-docker rm sms vault
-docker rmi nexus3.onap.org:10001/onap/aaf/sms
-docker rmi docker.io/vault:0.10.0
+kill-instance.sh sms
+kill-instance.sh vault