commit e29c8d46556abb9d41660bdf1e6149569288f91b
author A R Karthick <kramanar@ciena.com> Thu Apr 27 11:38:52 2017 -0700
committer A R Karthick <kramanar@ciena.com> Thu Apr 27 11:38:52 2017 -0700
tree 05e10b1cde93913912462929b6473852ff3cb74b
parent 5d30b3c5a276b57390eebcfa7c00cfe32b44e60a

Add vsg all subscriber create and delete tests.
Change per subscriber create tests to create and delete versions.

Change-Id: Ic9ee694524155c5a30c433dab6c5388a2d356cf5

src/test/vsg/vsgTest.py

diff --git a/src/test/vsg/vsgTest.py b/src/test/vsg/vsgTest.py
index 070e3f8..b8476ae 100644
--- a/src/test/vsg/vsgTest.py
+++ b/src/test/vsg/vsgTest.py
@@ -1992,27 +1992,49 @@
         log.info('Deleting VOLT Tenant ID %s for subscriber %s' %(voltId, subId))
         self.restApiXos.ApiDelete('TENANT_VOLT', voltId)
 
-    def test_vsg_xos_subscriber(self):
+    def vsg_xos_subscriber_id(self, index):
+        volt_subscriber_info = self.volt_subscriber_info[index]
+        result = self.restApiXos.ApiGet('TENANT_SUBSCRIBER')
+        assert_not_equal(result, None)
+        subId = self.restApiXos.getSubscriberId(result, volt_subscriber_info['account_num'])
+        return subId
+
+    def test_vsg_xos_subscriber_create_all(self):
+        for index in xrange(len(self.subscriber_info)):
+            #check if the index exists
+            subId = self.vsg_xos_subscriber_id(index)
+            if subId and subId != '0':
+                self.vsg_xos_subscriber_delete(index, subId = subId)
+            subId = self.vsg_xos_subscriber_create(index)
+            log.info('Created Subscriber %s' %(subId))
+
+    def test_vsg_xos_subscriber_delete_all(self):
+        for index in xrange(len(self.subscriber_info)):
+            subId = self.vsg_xos_subscriber_id(index)
+            if subId and subId != '0':
+                self.vsg_xos_subscriber_delete(index, subId = subId)
+
+    def test_vsg_xos_subscriber_create_and_delete(self):
         subId = self.vsg_xos_subscriber_create(0)
         if subId and subId != '0':
             self.vsg_xos_subscriber_delete(0, subId)
 
-    def test_vsg_xos_subscriber_2(self):
+    def test_vsg_xos_subscriber_2_create_and_delete(self):
         subId = self.vsg_xos_subscriber_create(1)
         if subId and subId != '0':
             self.vsg_xos_subscriber_delete(1, subId)
 
-    def test_vsg_xos_subscriber_3(self):
+    def test_vsg_xos_subscriber_3_create_and_delete(self):
         subId = self.vsg_xos_subscriber_create(2)
         if subId and subId != '0':
             self.vsg_xos_subscriber_delete(2, subId)
 
-    def test_vsg_xos_subscriber_4(self):
+    def test_vsg_xos_subscriber_4_create_and_delete(self):
         subId = self.vsg_xos_subscriber_create(3)
         if subId and subId != '0':
             self.vsg_xos_subscriber_delete(3, subId)
 
-    def test_vsg_xos_subscriber_5(self):
+    def test_vsg_xos_subscriber_5_create_and_delete(self):
         subId = self.vsg_xos_subscriber_create(4)
         if subId and subId != '0':
             self.vsg_xos_subscriber_delete(4, subId)