Merge "[cloudify_ims] Support Cloudify 4.0"

1 files changed, 0 insertions, 66 deletions

diff --git a/functest/opnfv_tests/vnf/ims/clearwater.py b/functest/opnfv_tests/vnf/ims/clearwater.py
deleted file mode 100644
index 33ed352d..00000000
--- a/functest/opnfv_tests/vnf/ims/clearwater.py
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env python
-# coding: utf8
-#######################################################################
-#
-#   Copyright (c) 2015 Orange
-#   valentin.boucher@orange.com
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-########################################################################
-
-
-class Clearwater(object):
-
-    def __init__(self, inputs={}, orchestrator=None, logger=None):
-        self.config = inputs
-        self.orchestrator = orchestrator
-        self.logger = logger
-        self.deploy = False
-
-    def set_orchestrator(self, orchestrator):
-        self.orchestrator = orchestrator
-
-    def set_flavor_id(self, flavor_id):
-        self.config['flavor_id'] = flavor_id
-
-    def set_image_id(self, image_id):
-        self.config['image_id'] = image_id
-
-    def set_agent_user(self, agent_user):
-        self.config['agent_user'] = agent_user
-
-    def set_external_network_name(self, external_network_name):
-        self.config['external_network_name'] = external_network_name
-
-    def set_public_domain(self, public_domain):
-        self.config['public_domain'] = public_domain
-
-    def deploy_vnf(self, blueprint, bp_name='clearwater',
-                   dep_name='clearwater-opnfv'):
-        if self.orchestrator:
-            self.dep_name = dep_name
-            error = self.orchestrator.download_upload_and_deploy_blueprint(
-                blueprint, self.config, bp_name, dep_name)
-            if error:
-                return error
-
-            self.deploy = True
-
-        else:
-            if self.logger:
-                self.logger.error("Cloudify manager is down or not provide...")
-
-    def undeploy_vnf(self):
-        if self.orchestrator:
-            if self.deploy:
-                self.deploy = False
-                self.orchestrator.undeploy_deployment(self.dep_name)
-            else:
-                if self.logger:
-                    self.logger.error("Clearwater isn't already deploy...")
-        else:
-            if self.logger:
-                self.logger.error("Cloudify manager is down or not provide...")