Euphrates cleaning: remove any reference to aaa vnf

aaa vnf was created in Danube to illustrate the vnf abstraction
as real implementations are now available and nobody really
implements a real aaa test case, it is better to remove any reference
to aaa vnf

Note modification on the documentation will be done accordingly

Change-Id: Iab6d96c955a6a7dc178588592382e42d68ec604c
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 1a42101..9f65339 100644 (file)
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -20,22 +20,6 @@ tiers:
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
                     class: 'CloudifyIms'
-
-            -
-                case_name: aaa
-                enabled: false
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    Simple VNF.
-                dependencies:
-                    installer: ''
-                    scenario: ''
-                run:
-                    module: 'functest.opnfv_tests.vnf.aaa.aaa'
-                    class: 'AaaVnf'
-
             -
                 case_name: orchestra_openims
                 project_name: functest

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 49ba7a9..b3fc397 100644 (file)
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -116,10 +116,6 @@ rally:
     router_name: rally-router
 
 vnf:
-    aaa:
-        tenant_name: aaa
-        tenant_description: Freeradius server
-        tenant_images: {}
     juju_epc:
         tenant_name: epc
         tenant_description: OAI EPC deployed with Juju

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 7c51987..b0472b2 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -478,22 +478,6 @@ tiers:
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
                     class: 'CloudifyIms'
-
-            -
-                case_name: aaa
-                enabled: false
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    Simple VNF.
-                dependencies:
-                    installer: ''
-                    scenario: ''
-                run:
-                    module: 'functest.opnfv_tests.vnf.aaa.aaa'
-                    class: 'AaaVnf'
-
             -
                 case_name: orchestra_openims
                 project_name: functest

diff --git a/functest/opnfv_tests/vnf/aaa/__init__.py b/functest/opnfv_tests/vnf/aaa/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/functest/opnfv_tests/vnf/aaa/aaa.py b/functest/opnfv_tests/vnf/aaa/aaa.py
deleted file mode 100644 (file)
index 71e3c97..0000000
--- a/functest/opnfv_tests/vnf/aaa/aaa.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2016 Orange and others.
-#
-# 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
-
-import logging
-
-import functest.core.vnf as vnf
-
-
-class AaaVnf(vnf.VnfOnBoarding):
-    """AAA VNF sample"""
-
-    logger = logging.getLogger(__name__)
-
-    def __init__(self, **kwargs):
-        if "case_name" not in kwargs:
-            kwargs["case_name"] = "aaa"
-        super(AaaVnf, self).__init__(**kwargs)
-
-    def deploy_orchestrator(self):
-        self.logger.info("No VNFM needed to deploy a free radius here")
-        return True
-
-    def deploy_vnf(self):
-        self.logger.info("Freeradius VNF deployment")
-        # find a way to deploy freeradius and tester (heat,manual, ..)
-        deploy_vnf = {'status': 'PASS', 'version': 'xxxx'}
-        self.details['deploy_vnf'] = deploy_vnf
-        return True
-
-    def test_vnf(self):
-        self.logger.info("Run test towards freeradius")
-        # once the freeradius is deployed..make some tests
-        test_vnf = {'status': 'PASS', 'version': 'xxxx'}
-        self.details['test_vnf'] = test_vnf
-        return True