commit abe3a9c54816737189ddbb4a56c3689a311830ab
author HARDIK WINDLASS <hardik_windlass@infosys.com> Mon Mar 18 16:17:28 2019 +0530
committer HARDIK WINDLASS <hardik_windlass@infosys.com> Mon Mar 25 08:45:58 2019 +0530
tree 8a81654353d12e6564662fe043eb49abd6cfdb89
parent a4a279a01e57b1eace41c29d1e01e72fc54f1ad5

[SEBA-313] Added unique check for s-tag and c-tag combination

Change-Id: Ia8d0864630c48e513100faa3ed6b0b1a5fb19c86

xos/synchronizer/models/test_models.py

diff --git a/xos/synchronizer/models/test_models.py b/xos/synchronizer/models/test_models.py
index 406e607..072b7f5 100644
--- a/xos/synchronizer/models/test_models.py
+++ b/xos/synchronizer/models/test_models.py
@@ -159,23 +159,34 @@
         self.assertEqual(e.exception.message, "The c_tag you specified (111) has already been used on device BRCM1234")
         self.models_decl.RCORDSubscriber_decl.save.assert_not_called()
 
-    def _test_validate_c_tag_on_same_s_tag(self):
+    def test_validate_get_used_s_c_tag_subscriber_id(self):
         """
         check that other subscriber using the same s_tag don't have the same c_tag
         """
-        s = Mock()
-        s.id = 123
-        s.c_tag = 111
-        s.s_tag = 222
-        s.onu_device = "BRCM1234"
+        s1 = Mock()
+        s1.id = 456
+        s1.c_tag = 999
+        s1.s_tag = 222
+        s1.onu_device = "BRCM1234"
+
+        s2 = Mock()
+        s2.id = 123
+        s2.c_tag = 111
+        s2.s_tag = 222
+        s2.onu_device = "BRCM12345"
+
+        self.rcord_subscriber.get_same_onu_subscribers = Mock()
+        self.rcord_subscriber.get_same_onu_subscribers.return_value = [s1]
+
+        self.rcord_subscriber.get_same_s_c_tag_subscribers = Mock()
+        self.rcord_subscriber.get_same_s_c_tag_subscribers.return_value = [s2]
 
         with self.assertRaises(Exception) as e:
             self.rcord_subscriber.save()
 
-        self.assertEqual(e.exception.message, "The c_tag you specified (111) has already been used by Subscriber with id 123 and the same s_tag: 222")
+        self.assertEqual(e.exception.message, "The c_tag(111) and s_tag(222) pair you specified,has already been used by Subscriber with Id (123)")
         self.models_decl.RCORDSubscriber_decl.save.assert_not_called()
 
-
     def test_validate_c_tag_on_update(self):
         s = Mock()
         s.c_tag = 111
@@ -210,9 +221,15 @@
     def test_generate_c_tag(self):
         s = Mock()
         s.c_tag = "111"
+        s.s_tag = "223"
         s.onu_device = "BRCM1234"
 
-        self.models_decl.RCORDSubscriber_decl.objects.filter.return_value = [s]
+        self.rcord_subscriber.get_same_onu_subscribers = Mock()
+        self.rcord_subscriber.get_same_onu_subscribers.return_value = [s]
+
+        self.rcord_subscriber.get_same_s_c_tag_subscribers = Mock()
+        self.rcord_subscriber.get_same_s_c_tag_subscribers.return_value = []
+
         self.rcord_subscriber.c_tag = None
 
         self.rcord_subscriber.save()
@@ -223,7 +240,7 @@
         self.assertLess(self.rcord_subscriber.c_tag, 4097)
 
     def test_generate_s_tag(self):
-        self.rcord_subscriber.c_tag = None
+        self.rcord_subscriber.s_tag = None
 
         self.rcord_subscriber.save()
 
@@ -236,6 +253,5 @@
         self.assertEqual(self.rcord_subscriber.s_tag, 222)
 
 
-
 if __name__ == '__main__':
     unittest.main()