[asterisk-scf-commits] asterisk-scf/integration/testsuite.git branch "review" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Fri Jun 24 09:41:10 CDT 2011


branch "review" has been updated
       via  c071b6b486e031de1fe7f479dd9e11d1cd442245 (commit)
       via  95f591d56668f080a23b752648cd5f04ec7c2e96 (commit)
      from  634c6bfa283faf5a7349ff77a3ba9b43e4db8669 (commit)

Summary of changes:
 .../sip/Functional_Call_Simple}/testcase.yaml      |   10 +-
 tests/asterisk_scf_components/tests.yaml           |    6 +
 .../testcase.yaml                                  |   16 ---
 tests/failover/tests.yaml                          |    2 -
 tests/tests.yaml                                   |    3 +-
 testsuite.py                                       |  138 ++++++++++++++------
 6 files changed, 110 insertions(+), 65 deletions(-)
 rename tests/{sip/Functional_Basic_CallSetup => asterisk_scf_components/sip/Functional_Call_Simple}/testcase.yaml (96%)
 create mode 100644 tests/asterisk_scf_components/tests.yaml
 delete mode 100644 tests/failover/Functional_Basic_Call_Setup_w_Failover/testcase.yaml
 delete mode 100644 tests/failover/tests.yaml


- Log -----------------------------------------------------------------
commit c071b6b486e031de1fe7f479dd9e11d1cd442245
Author: Darren Sessions <dsessions at digium.com>
Date:   Fri Jun 24 09:38:52 2011 -0500

    Working on integrating a documentation mode into the testsuite server.

diff --git a/tests/asterisk_scf_components/sip/Functional_Call_Simple/testcase.yaml b/tests/asterisk_scf_components/sip/Functional_Call_Simple/testcase.yaml
new file mode 100644
index 0000000..8a694c3
--- /dev/null
+++ b/tests/asterisk_scf_components/sip/Functional_Call_Simple/testcase.yaml
@@ -0,0 +1,359 @@
+name : Functional_Basic_CallSetup
+docs :
+    summary : Test basic call setup.
+    description :   'Start Asterisk SCF and use the configurator to push two endpoints to the
+                    SIP Session Gateway. Using SIPp, send a call to Asterisk SCF with the 
+                    expectation that it will forward the call to the second SIPp process. This
+                    test additionally tests ipv4 <> ipv4, ipv4 <> ipv6, ipv6 <> ipv4, and
+                    ipv6 <> ipv6 transports.'
+    repo_url : 'http://git.asterisk.org/gitweb/?p=asterisk-scf/release/testsuite.git;a=tree;f=bamboo;hb=HEAD'
+tests :
+    - ipv4toipv4 :
+        expected_failure : False 
+        timeline:
+            - wireshark :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start:
+                        host_filter :
+                            - testsuite-remote-1.digium.internal
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
+                        protocol_filter :
+                            - sip
+                            - rtp
+                            - icmp
+                            - t38
+                            - dns
+            - asteriskscf_icebox :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start :
+                        - service_locator
+                        - bridge
+                        - routing
+                        - sip_session_gateway
+                        - media_rtp_pjmedia
+            - asteriskscf_configurator :
+                service_locator_host : testsuite-remote-1.digium.internal
+                configuration_wipe : False
+                cmd :
+                    sip :
+                        - listen_udp4 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv4
+                        - service :
+                            type : endpoint
+                            targethost : testsuite-remote-2.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv4
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : False
+                        - sipp :
+                            type : endpoint
+                            targethost : testsuite-remote-3.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv4
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : False
+                    rtp :
+                         - general :
+                            startport : 10001
+                            endport : 20000
+                            workerthreadcount : 4
+            - sipp:
+                testsuite_remote_host : testsuite-remote-2.digium.internal
+                cmd :
+                    - uas :
+                        transport : udp
+                        ipv4oripv6 : ipv4
+                        timeout : 10
+            - sipp:
+                testsuite_remote_host : testsuite-remote-3.digium.internal
+                cmd :
+                    - uac :
+                        calls : 1
+                        cps : 1
+                        duration : 10
+                        targethost : testsuite-remote-1.digium.internal
+                        ipv4oripv6 : ipv4
+                        transport : udp
+                        timeout : 10
+            - wireshark :
+                run_on_test_failure : True
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    stop :
+    - ipv6toipv6 :
+        expected_failure : False 
+        timeline:
+            - wireshark :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start:
+                        host_filter :
+                            - testsuite-remote-1.digium.internal
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
+                        protocol_filter :
+                            - sip
+                            - rtp
+                            - icmp
+                            - t38
+                            - dns
+            - asteriskscf_icebox :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start :
+                        - service_locator
+                        - logger_server
+                        - bridge
+                        - routing
+                        - sip_session_gateway
+                        - media_rtp_pjmedia
+            - asteriskscf_configurator :
+                service_locator_host : testsuite-remote-1.digium.internal
+                configuration_wipe : False
+                cmd :
+                    sip :
+                        - listen_udp6 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv6
+                        - service :
+                            type : endpoint
+                            targethost : testsuite-remote-2.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv6
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : True
+                        - sipp :
+                            type : endpoint
+                            targethost : testsuite-remote-3.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv6
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : True
+                    rtp :
+                         - general :
+                            startport : 10001
+                            endport : 20000
+                            workerthreadcount : 4
+            - sipp:
+                testsuite_remote_host : testsuite-remote-2.digium.internal
+                cmd :
+                    - uas :
+                        transport : udp
+                        ipv4oripv6 : ipv6
+                        timeout : 10
+            - sipp:
+                testsuite_remote_host : testsuite-remote-3.digium.internal
+                cmd :
+                    - uac :
+                        calls : 1
+                        cps : 1
+                        duration : 10
+                        targethost : testsuite-remote-1.digium.internal
+                        ipv4oripv6 : ipv6
+                        transport : udp
+                        timeout : 10
+            - wireshark :
+                run_on_test_failure : True
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    stop :
+    - ipv6toipv4 :
+        expected_failure : False 
+        timeline:
+            - wireshark :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start:
+                        host_filter :
+                            - testsuite-remote-1.digium.internal
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
+                        protocol_filter :
+                            - sip
+                            - rtp
+                            - icmp
+                            - t38
+                            - dns
+            - asteriskscf_icebox :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start :
+                        - service_locator
+                        - logger_server
+                        - bridge
+                        - routing
+                        - sip_session_gateway
+                        - media_rtp_pjmedia
+            - asteriskscf_configurator :
+                service_locator_host : testsuite-remote-1.digium.internal
+                configuration_wipe : False
+                cmd :
+                    sip :
+                        - listen_udp4 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv4
+                        - listen_udp6 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv6
+                        - service :
+                            type : endpoint
+                            targethost : testsuite-remote-2.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv4
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : False
+                        - sipp :
+                            type : endpoint
+                            targethost : testsuite-remote-3.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv6
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : True
+                    rtp :
+                         - general :
+                            startport : 10001
+                            endport : 20000
+                            workerthreadcount : 4
+            - sipp:
+                testsuite_remote_host : testsuite-remote-2.digium.internal
+                cmd :
+                    - uas :
+                        transport : udp
+                        ipv4oripv6 : ipv4
+                        timeout : 10
+            - sipp:
+                testsuite_remote_host : testsuite-remote-3.digium.internal
+                cmd :
+                    - uac :
+                        calls : 1
+                        cps : 1
+                        duration : 10
+                        targethost : testsuite-remote-1.digium.internal
+                        ipv4oripv6 : ipv6
+                        transport : udp
+                        timeout : 10
+            - wireshark :
+                run_on_test_failure : True
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    stop :
+    - ipv4toipv6 :
+        expected_failure : False 
+        timeline:
+            - wireshark :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start:
+                        host_filter :
+                            - testsuite-remote-1.digium.internal
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
+                        protocol_filter :
+                            - sip
+                            - rtp
+                            - icmp
+                            - t38
+                            - dns
+            - asteriskscf_icebox :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start :
+                        - service_locator
+                        - logger_server
+                        - bridge
+                        - routing
+                        - sip_session_gateway
+                        - media_rtp_pjmedia
+            - asteriskscf_configurator :
+                service_locator_host : testsuite-remote-1.digium.internal
+                configuration_wipe : False
+                cmd :
+                    sip :
+                        - listen_udp4 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv4
+                        - listen_udp6 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv6
+                        - service :
+                            type : endpoint
+                            targethost : testsuite-remote-2.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv6
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : True
+                        - sipp :
+                            type : endpoint
+                            targethost : testsuite-remote-3.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv4
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : False
+                    rtp :
+                         - general :
+                            startport : 10001
+                            endport : 20000
+                            workerthreadcount : 4
+            - sipp:
+                testsuite_remote_host : testsuite-remote-2.digium.internal
+                cmd :
+                    - uas :
+                        transport : udp
+                        ipv4oripv6 : ipv6
+                        timeout : 10
+            - sipp:
+                testsuite_remote_host : testsuite-remote-3.digium.internal
+                cmd :
+                    - uac :
+                        calls : 1
+                        cps : 1
+                        duration : 10
+                        targethost : testsuite-remote-1.digium.internal
+                        ipv4oripv6 : ipv4
+                        transport : udp
+                        timeout : 10
+            - wireshark :
+                run_on_test_failure : True
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    stop :
diff --git a/testsuite.py b/testsuite.py
index 56ca86e..9dc7eaf 100755
--- a/testsuite.py
+++ b/testsuite.py
@@ -43,16 +43,30 @@ class __main__:
         except:
             pass
 
-        self.globalVars = {'cwd':cwd, 'hostname':hostname, 'testInfo':{}}
+        self.globalVars = {'cwd':cwd, 'hostname':hostname, 'testInfo':{}, 'mode':'testing'}
 
-        if len(argv) == 3:
-            self.globalVars['bambooBuildKey'] = argv[1]
-            self.globalVars['bambooBuildNum'] = argv[2]
+        if len(argv) >= 2:
+            self.globalVars['mode'] = argv[1]
+        else:
+            print >> sys.stderr, ' A run mode (testing or docs) must be specified as the first argument.'
+            sys.exit(1)
+
+        if len(argv) == 4:
+            self.globalVars['bambooBuildKey'] = argv[2]
+            self.globalVars['bambooBuildNum'] = argv[3]
             self.globalVars['bambooBuildURL'] = 'http://bamboo.asterisk.org/artifact/%s/build-%s/Artifacts/' % (re.sub(r'SUITE-', 'SUITE/', self.globalVars['bambooBuildKey']), self.globalVars['bambooBuildNum'])
         else:
             print >> sys.stderr, ' NOTE: The Bamboo build key and build number are both\n       required to generate artifact link URLs.\n'
 
-        self.yamlData = yaml_parser.testcases().returnData
+        if not self.globalVars['mode'] == 'testing' and not self.globalVars['mode'] == 'docs':
+            print >> sys.stderr, ' %s is an invalid mode.' % self.globalVars['mode']
+            sys.exit(1)
+
+        if self.globalVars['mode'] == 'testing':
+            self.yamlData = yaml_parser.testcases().returnData
+        elif self.globalVars['mode'] == 'docs':
+            self.yamlData = yaml_parser.docs().returnData
+
         self.testsuite()
 
     def testsuite(self):
@@ -61,7 +75,8 @@ class __main__:
         shutdownList = []
         stopTests = False
 
-        x = xml().initTestSuite()
+        if self.globalVars['mode'] == 'testing':
+            x = xml().initTestSuite()
 
         for list in self.yamlData:
             if stopTests == True:
@@ -69,18 +84,30 @@ class __main__:
             for testCategory in list:
                 if stopTests == True:
                     break
-                x, categoryElement = xml().addTestSuite(x, testCategory)
-                print >> sys.stderr, "\n Starting '%s' Tests . . \n --------------------------------------------------------" % testCategory
+                if self.globalVars['mode'] == 'testing':
+                    x, categoryElement = xml().addTestSuite(x, testCategory)
+                    print >> sys.stderr, "\n Starting '%s' Tests . . \n --------------------------------------------------------" % testCategory
                 for testData in list[testCategory]:
-                    categoryElement, testElement = xml().addTestSuite(categoryElement, testData['name'])
-                    print >> sys.stderr, ' |- Testcase: %s ' % testData['name']
+                    if self.globalVars['mode'] == 'testing':
+                        categoryElement, testElement = xml().addTestSuite(categoryElement, testData['name'])
+                        print >> sys.stderr, ' |- Testcase: %s ' % testData['name']
                     if not 'options' in testData:
                         testData['options'] = {}
                     for subTestCase in testData['tests']:
+                        if self.globalVars['mode'] == 'docs':
+                            if not 'docs' in testData:
+                                print >> sys.stderr, 'No documentation specified for testcase: %s' % testData['name']
+                                break  
+                            else:
+                                print >> sys.stderr, 'Loading documentation for testcase: %s' % testData['name']
+                            print testData['docs']
+                        docs = []
                         timerStart = datetime.datetime.now()
                         if stopTests == True:
                             break
                         for testName in subTestCase:
+                            if not testData['docs']['list_test'] == testName:
+                                break
                             self.globalVars['testSuccess'] = True
                             self.globalVars['testMsg'] = ''
                             self.globalVars['testInfo']['testCategory'] = testCategory
@@ -88,7 +115,10 @@ class __main__:
                             self.globalVars['testInfo']['testName'] = testName
                             self.globalVars['testInfo']['testPath'] = "%s/%s/%s" % (testCategory, testData['name'], testName)
                             self.globalVars['testInfo']['testOpts'] = testData['options'] 
-                            testElement, subTestElement = xml().addTestCase(testElement, testName)
+
+                            if self.globalVars['mode'] == 'testing':
+                                testElement, subTestElement = xml().addTestCase(testElement, testName)
+
                             if subTestCase[testName]:
                                 success = True
                 
@@ -111,6 +141,8 @@ class __main__:
                                 ''' execute testcase timeline '''
                                 for timeLine in subTestCase[testName]['timeline']:
                                     for plugin in timeLine:
+                                        #print '\n\n%s\n\n' % plugin
+                                        self.globalVars['testInfo']['testPlugin'] = plugin
                                         runResults = plugins().execute(plugin, pluginData[plugin]['module'], timeLine[plugin], testData['path'], self.globalVars)
                                         if not 'shutdownList' in runResults:
                                             if not 'shutdownExempt' in runResults:
@@ -123,34 +155,40 @@ class __main__:
                                             self.globalVars['testSuccess'] = False
                                             self.globalVars['testMsg'] = runResults['msg'] = "'%s' plugin: %s" % (plugin, runResults['msg'])
                                             break
-
-                                ''' get timer delta '''
-                                timerDelta = datetime.datetime.now() - timerStart
-
-                                ''' shutdown if 'restart_persistant_plugins_between_tests' is true or not specified '''
-                                for d in shutdownList:
-                                    for host in d:
-                                        remote = xmlrpclib.Server('http://%s:8000' % host)
-                                        try:
-                                            remote.shutdown(d[host]) 
-                                        except:
-                                            pass
-
-                                if self.globalVars['testSuccess'] == False:
-                                    print >> sys.stderr, '   |- Test "' + testName + '" - FAILED!\n    \- ' + self.globalVars['testMsg']
-                                    xmlFailureMsg = '%s' % self.globalVars['testMsg']
-                                    if 'bambooBuildURL' in self.globalVars:
-                                        xmlFailureMsg = '%s\nIf artifacts specific to this test were generated,\n' % self.globalVars['testMsg']
-                                        xmlFailureMsg = '%s they can be found pasting the link below in your browser or by clicking the Artifacts tab above.\n\n' % xmlFailureMsg
-                                        xmlFailureMsg = '%s%s%s' % (xmlFailureMsg, self.globalVars['bambooBuildURL'], self.globalVars['testInfo']['testPath'])
-                                    subTestElement, errorMsgs = xml().addFailure(subTestElement, [xmlFailureMsg])
-                                    if 'stop_tests_on_failure' in self.globalVars['testInfo']['testOpts']:
-                                        if self.globalVars['testInfo']['testOpts']['stop_tests_on_failure'] == True:
-                                            stopTests = True
-                                    break
+                                        if runResults['success'] == 'docs':
+                                            #print runResults['docs']
+                                            docs.append(runResults['docs'])
+                            
+                                if self.globalVars['mode'] == 'testing':            
+                                    ''' get timer delta '''
+                                    timerDelta = datetime.datetime.now() - timerStart
+
+                                    ''' shutdown if 'restart_persistant_plugins_between_tests' is true or not specified '''
+                                    for d in shutdownList:
+                                        for host in d:
+                                            remote = xmlrpclib.Server('http://%s:8000' % host)
+                                            try:
+                                                remote.shutdown(d[host]) 
+                                            except:
+                                                pass
+
+                                    if self.globalVars['testSuccess'] == False:
+                                        print >> sys.stderr, '   |- Test "' + testName + '" - FAILED!\n    \- ' + self.globalVars['testMsg']
+                                        xmlFailureMsg = '%s' % self.globalVars['testMsg']
+                                        if 'bambooBuildURL' in self.globalVars:
+                                            xmlFailureMsg = '%s\nIf artifacts specific to this test were generated,\n' % self.globalVars['testMsg']
+                                            xmlFailureMsg = '%s they can be found pasting the link below in your browser or by clicking the Artifacts tab above.\n\n' % xmlFailureMsg
+                                            xmlFailureMsg = '%s%s%s' % (xmlFailureMsg, self.globalVars['bambooBuildURL'], self.globalVars['testInfo']['testPath'])
+                                        subTestElement, errorMsgs = xml().addFailure(subTestElement, [xmlFailureMsg])
+                                        if 'stop_tests_on_failure' in self.globalVars['testInfo']['testOpts']:
+                                            if self.globalVars['testInfo']['testOpts']['stop_tests_on_failure'] == True:
+                                                stopTests = True
+                                        break
                 
-                                print >> sys.stderr, '   |- ' + testName + ' - PASSED! - %s.%s seconds' % (timerDelta.seconds, timerDelta.microseconds)
-                                subTestElement = xml().setProperty(subTestElement, 'time', '%s.%s' % (timerDelta.seconds, timerDelta.microseconds))
+                                    print >> sys.stderr, '   |- ' + testName + ' - PASSED! - %s.%s seconds' % (timerDelta.seconds, timerDelta.microseconds)
+                                    subTestElement = xml().setProperty(subTestElement, 'time', '%s.%s' % (timerDelta.seconds, timerDelta.microseconds))
+                                elif self.globalVars['mode'] == 'docs':
+                                    documentation().processor(docs)
                             else:
                                 print >> sys.stderr, '   |- ' + testName + ' - FAILED!\n    \- No test data defined!'
                                 subTestElement, errorMsgs = xml().addFailure(subTestElement, ['No test data defined!'])
@@ -159,12 +197,13 @@ class __main__:
                     if stopTests == True:
                         break
 
-        print >> sys.stderr, "\n\n" + xml().prettyXml(x)
-        results = file().write('testsuite_results.xml', xml().prettyXml(x))
-        if results['success'] == False:
-            print >> sys.stderr, 'Unable to generate XML test results file.'
+        if self.globalVars['mode'] == 'testing':
+            print >> sys.stderr, "\n\n" + xml().prettyXml(x)
+            results = file().write('testsuite_results.xml', xml().prettyXml(x))
+            if results['success'] == False:
+                print >> sys.stderr, 'Unable to generate XML test results file.'
+            cleanup()
 
-        cleanup()
         return
 
     def _banner(self):
@@ -176,6 +215,19 @@ class __main__:
         print >> sys.stderr, "+  Copyright (C) 2011, Digium, Inc. -  www.digium.com  +"
         print >> sys.stderr, "--------------------------------------------------------\n"
 
+class documentation:
+    def processor(self, docs):
+        for wit in docs:
+            for wth in wit:
+                if wth['cmd'] == 'run':
+                    print wth['args'][1]['testInfo']['testPlugin']
+                    args = ' '.join(wth['args'][4])
+                    args = args.replace('!!TMP!!/sipp/sipp/trunk/sipp', 'sipp')
+                    args = args.replace('!!CWD!!/tests/sip/Functional_Basic_Call_Forward_Blind_Transfer/scenarios/', './')
+                    args = args.replace('!!TMP!!/', './')
+                    args = args.replace('/tmp/', './')
+                    print args
+        
 class plugins:
     def execute(self, name, module, testData, testPath, globalVars):
         try:

commit 95f591d56668f080a23b752648cd5f04ec7c2e96
Author: Darren Sessions <dsessions at digium.com>
Date:   Wed Jun 22 09:38:18 2011 -0500

    shuffling tests around to further refine the test layouts

diff --git a/tests/asterisk_scf_components/tests.yaml b/tests/asterisk_scf_components/tests.yaml
new file mode 100644
index 0000000..4b5dc50
--- /dev/null
+++ b/tests/asterisk_scf_components/tests.yaml
@@ -0,0 +1,6 @@
+tests :
+#    - service_locator
+#    - bridge
+#    - routing
+    - sip
+#    - media
diff --git a/tests/failover/Functional_Basic_Call_Setup_w_Failover/testcase.yaml b/tests/failover/Functional_Basic_Call_Setup_w_Failover/testcase.yaml
deleted file mode 100644
index 89beebb..0000000
--- a/tests/failover/Functional_Basic_Call_Setup_w_Failover/testcase.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-name : Functional_Basic_Call_Setup_w_Failover
-options : 
-    network_captures: True
-    call_flow_diagrams: True
-    restart_persistant_plugins_between_tests: False
-tests :
-    - ipv4 :
-        expected_failure : False 
-        timeline :
-            - failover :
-                cmd :
-                    testsuite_remote_active : testsuite-remote-1.digium.internal
-                    testsuite_remote_standby : testsuite-remote-2.digium.internal
-                    ipv4oripv6 : ipv4
-                    ipv4_network_addr : 10.19.136.0
-                    shared_ip : 10.19.139.44
diff --git a/tests/failover/tests.yaml b/tests/failover/tests.yaml
deleted file mode 100644
index d858490..0000000
--- a/tests/failover/tests.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-testcase :
-    - Functional_Basic_Call_Setup_w_Failover
diff --git a/tests/sip/Functional_Basic_CallSetup/testcase.yaml b/tests/sip/Functional_Basic_CallSetup/testcase.yaml
deleted file mode 100644
index a9ada89..0000000
--- a/tests/sip/Functional_Basic_CallSetup/testcase.yaml
+++ /dev/null
@@ -1,353 +0,0 @@
-name : Functional_Basic_CallSetup
-options : 
-    restart_persistant_plugins_between_tests: True
-tests :
-    - ipv4toipv4 :
-        expected_failure : False 
-        timeline:
-            - wireshark :
-                testsuite_remote_host : testsuite-remote-1.digium.internal
-                cmd :
-                    start:
-                        host_filter :
-                            - testsuite-remote-1.digium.internal
-                            - testsuite-remote-2.digium.internal
-                            - testsuite-remote-3.digium.internal
-                        protocol_filter :
-                            - sip
-                            - rtp
-                            - icmp
-                            - t38
-                            - dns
-            - asteriskscf_icebox :
-                testsuite_remote_host : testsuite-remote-1.digium.internal
-                cmd :
-                    start :
-                        - service_locator
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
-            - asteriskscf_configurator :
-                service_locator_host : testsuite-remote-1.digium.internal
-                configuration_wipe : False
-                cmd :
-                    sip :
-                        - listen_udp4 :
-                            type : transport_udp
-                            host : testsuite-remote-1.digium.internal
-                            port : 5060
-                            ipv4oripv6 : ipv4
-                        - service :
-                            type : endpoint
-                            targethost : testsuite-remote-2.digium.internal
-                            targetport : 5060
-                            sourcehost : testsuite-remote-1.digium.internal
-                            sourceport : 5060
-                            ipv4oripv6 : ipv4
-                            direction : both
-                            securetransport : none
-                            rtpoveripv6 : False
-                        - sipp :
-                            type : endpoint
-                            targethost : testsuite-remote-3.digium.internal
-                            targetport : 5060
-                            sourcehost : testsuite-remote-1.digium.internal
-                            sourceport : 5060
-                            ipv4oripv6 : ipv4
-                            direction : both
-                            securetransport : none
-                            rtpoveripv6 : False
-                    rtp :
-                         - general :
-                            startport : 10001
-                            endport : 20000
-                            workerthreadcount : 4
-            - sipp:
-                testsuite_remote_host : testsuite-remote-2.digium.internal
-                cmd :
-                    - uas :
-                        transport : udp
-                        ipv4oripv6 : ipv4
-                        timeout : 10
-            - sipp:
-                testsuite_remote_host : testsuite-remote-3.digium.internal
-                cmd :
-                    - uac :
-                        calls : 1
-                        cps : 1
-                        duration : 10
-                        targethost : testsuite-remote-1.digium.internal
-                        ipv4oripv6 : ipv4
-                        transport : udp
-                        timeout : 10
-            - wireshark :
-                run_on_test_failure : True
-                testsuite_remote_host : testsuite-remote-1.digium.internal
-                cmd :
-                    stop :
-    - ipv6toipv6 :
-        expected_failure : False 
-        timeline:
-            - wireshark :
-                testsuite_remote_host : testsuite-remote-1.digium.internal
-                cmd :
-                    start:
-                        host_filter :
-                            - testsuite-remote-1.digium.internal
-                            - testsuite-remote-2.digium.internal
-                            - testsuite-remote-3.digium.internal
-                        protocol_filter :
-                            - sip
-                            - rtp
-                            - icmp
-                            - t38
-                            - dns
-            - asteriskscf_icebox :
-                testsuite_remote_host : testsuite-remote-1.digium.internal
-                cmd :
-                    start :
-                        - service_locator
-                        - logger_server
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
-            - asteriskscf_configurator :
-                service_locator_host : testsuite-remote-1.digium.internal
-                configuration_wipe : False
-                cmd :
-                    sip :
-                        - listen_udp6 :
-                            type : transport_udp
-                            host : testsuite-remote-1.digium.internal
-                            port : 5060
-                            ipv4oripv6 : ipv6
-                        - service :
-                            type : endpoint
-                            targethost : testsuite-remote-2.digium.internal
-                            targetport : 5060
-                            sourcehost : testsuite-remote-1.digium.internal
-                            sourceport : 5060
-                            ipv4oripv6 : ipv6
-                            direction : both
-                            securetransport : none
-                            rtpoveripv6 : True
-                        - sipp :
-                            type : endpoint
-                            targethost : testsuite-remote-3.digium.internal
-                            targetport : 5060
-                            sourcehost : testsuite-remote-1.digium.internal
-                            sourceport : 5060
-                            ipv4oripv6 : ipv6
-                            direction : both
-                            securetransport : none
-                            rtpoveripv6 : True
-                    rtp :
-                         - general :
-                            startport : 10001
-                            endport : 20000
-                            workerthreadcount : 4
-            - sipp:
-                testsuite_remote_host : testsuite-remote-2.digium.internal
-                cmd :
-                    - uas :
-                        transport : udp
-                        ipv4oripv6 : ipv6
-                        timeout : 10
-            - sipp:
-                testsuite_remote_host : testsuite-remote-3.digium.internal
-                cmd :
-                    - uac :
-                        calls : 1
-                        cps : 1
-                        duration : 10
-                        targethost : testsuite-remote-1.digium.internal
-                        ipv4oripv6 : ipv6
-                        transport : udp
-                        timeout : 10
-            - wireshark :
-                run_on_test_failure : True
-                testsuite_remote_host : testsuite-remote-1.digium.internal
-                cmd :
-                    stop :
-    - ipv6toipv4 :
-        expected_failure : False 
-        timeline:
-            - wireshark :
-                testsuite_remote_host : testsuite-remote-1.digium.internal
-                cmd :
-                    start:
-                        host_filter :
-                            - testsuite-remote-1.digium.internal
-                            - testsuite-remote-2.digium.internal
-                            - testsuite-remote-3.digium.internal
-                        protocol_filter :
-                            - sip
-                            - rtp
-                            - icmp
-                            - t38
-                            - dns
-            - asteriskscf_icebox :
-                testsuite_remote_host : testsuite-remote-1.digium.internal
-                cmd :
-                    start :
-                        - service_locator
-                        - logger_server
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
-            - asteriskscf_configurator :
-                service_locator_host : testsuite-remote-1.digium.internal
-                configuration_wipe : False
-                cmd :
-                    sip :
-                        - listen_udp4 :
-                            type : transport_udp
-                            host : testsuite-remote-1.digium.internal
-                            port : 5060
-                            ipv4oripv6 : ipv4
-                        - listen_udp6 :
-                            type : transport_udp
-                            host : testsuite-remote-1.digium.internal
-                            port : 5060
-                            ipv4oripv6 : ipv6
-                        - service :
-                            type : endpoint
-                            targethost : testsuite-remote-2.digium.internal
-                            targetport : 5060
-                            sourcehost : testsuite-remote-1.digium.internal
-                            sourceport : 5060
-                            ipv4oripv6 : ipv4
-                            direction : both
-                            securetransport : none
-                            rtpoveripv6 : False
-                        - sipp :
-                            type : endpoint
-                            targethost : testsuite-remote-3.digium.internal
-                            targetport : 5060
-                            sourcehost : testsuite-remote-1.digium.internal
-                            sourceport : 5060
-                            ipv4oripv6 : ipv6
-                            direction : both
-                            securetransport : none
-                            rtpoveripv6 : True
-                    rtp :
-                         - general :
-                            startport : 10001
-                            endport : 20000
-                            workerthreadcount : 4
-            - sipp:
-                testsuite_remote_host : testsuite-remote-2.digium.internal
-                cmd :
-                    - uas :
-                        transport : udp
-                        ipv4oripv6 : ipv4
-                        timeout : 10
-            - sipp:
-                testsuite_remote_host : testsuite-remote-3.digium.internal
-                cmd :
-                    - uac :
-                        calls : 1
-                        cps : 1
-                        duration : 10
-                        targethost : testsuite-remote-1.digium.internal
-                        ipv4oripv6 : ipv6
-                        transport : udp
-                        timeout : 10
-            - wireshark :
-                run_on_test_failure : True
-                testsuite_remote_host : testsuite-remote-1.digium.internal
-                cmd :
-                    stop :
-    - ipv4toipv6 :
-        expected_failure : False 
-        timeline:
-            - wireshark :
-                testsuite_remote_host : testsuite-remote-1.digium.internal
-                cmd :
-                    start:
-                        host_filter :
-                            - testsuite-remote-1.digium.internal
-                            - testsuite-remote-2.digium.internal
-                            - testsuite-remote-3.digium.internal
-                        protocol_filter :
-                            - sip
-                            - rtp
-                            - icmp
-                            - t38
-                            - dns
-            - asteriskscf_icebox :
-                testsuite_remote_host : testsuite-remote-1.digium.internal
-                cmd :
-                    start :
-                        - service_locator
-                        - logger_server
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
-            - asteriskscf_configurator :
-                service_locator_host : testsuite-remote-1.digium.internal
-                configuration_wipe : False
-                cmd :
-                    sip :
-                        - listen_udp4 :
-                            type : transport_udp
-                            host : testsuite-remote-1.digium.internal
-                            port : 5060
-                            ipv4oripv6 : ipv4
-                        - listen_udp6 :
-                            type : transport_udp
-                            host : testsuite-remote-1.digium.internal
-                            port : 5060
-                            ipv4oripv6 : ipv6
-                        - service :
-                            type : endpoint
-                            targethost : testsuite-remote-2.digium.internal
-                            targetport : 5060
-                            sourcehost : testsuite-remote-1.digium.internal
-                            sourceport : 5060
-                            ipv4oripv6 : ipv6
-                            direction : both
-                            securetransport : none
-                            rtpoveripv6 : True
-                        - sipp :
-                            type : endpoint
-                            targethost : testsuite-remote-3.digium.internal
-                            targetport : 5060
-                            sourcehost : testsuite-remote-1.digium.internal
-                            sourceport : 5060
-                            ipv4oripv6 : ipv4
-                            direction : both
-                            securetransport : none
-                            rtpoveripv6 : False
-                    rtp :
-                         - general :
-                            startport : 10001
-                            endport : 20000
-                            workerthreadcount : 4
-            - sipp:
-                testsuite_remote_host : testsuite-remote-2.digium.internal
-                cmd :
-                    - uas :
-                        transport : udp
-                        ipv4oripv6 : ipv6
-                        timeout : 10
-            - sipp:
-                testsuite_remote_host : testsuite-remote-3.digium.internal
-                cmd :
-                    - uac :
-                        calls : 1
-                        cps : 1
-                        duration : 10
-                        targethost : testsuite-remote-1.digium.internal
-                        ipv4oripv6 : ipv4
-                        transport : udp
-                        timeout : 10
-            - wireshark :
-                run_on_test_failure : True
-                testsuite_remote_host : testsuite-remote-1.digium.internal
-                cmd :
-                    stop :
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 9e29cbc..0a2eddd 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,4 +1,3 @@
 tests :
     - build
-    - sip
-#    - failover
+    - asterisk_scf

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/testsuite.git



More information about the asterisk-scf-commits mailing list