commit a2b87dfb8937debd1b1abf5f764207ba6b8d89c7
author Chetan Gaonker <chetang@calsoftlabs.com> Thu Mar 31 15:41:31 2016 -0700
committer Chetan Gaonker <chetang@calsoftlabs.com> Thu Mar 31 15:41:31 2016 -0700
tree 54244fb921ede33cca3cce50513298bbba965be1
parent 8bbc4d523f673dd1cb633bde32d8adf36db7ebf9

Add support for configuring OLT access device data with uplink/vlan information.
This is required when running on target OLT switches where we have to configure
the uplink/vlan information with the device ids for ONOS to program IGMP flows correctly.
Add methods for getting devices and flows from ONOS rest interface.
Change relevant OnosCtrl methods to class methods that are applicable for global onos configurations.

src/test/subscriber/subscriberTest.py

diff --git a/src/test/subscriber/subscriberTest.py b/src/test/subscriber/subscriberTest.py
index fca9335..ac01950 100644
--- a/src/test/subscriber/subscriberTest.py
+++ b/src/test/subscriber/subscriberTest.py
@@ -142,7 +142,7 @@
 class subscriber_exchange(unittest.TestCase):
 
       apps = [ 'org.onosproject.aaa', 'org.onosproject.dhcp' ]
-
+      olt_apps = [ 'org.onosproject.igmp', 'org.onosproject.cordmcast' ]
       dhcp_server_config = {
         "ip": "10.1.11.50",
         "mac": "ca:fe:ca:fe:ca:fe",
@@ -167,11 +167,11 @@
                 self.port_map = g_subscriber_port_map
           else:
                 log.info('Using OLT Port configuration for test setup')
-          for app in self.apps:
-              onos_ctrl = OnosCtrl(app)
-              status, _ = onos_ctrl.activate()
-              assert_equal(status, True)
-              time.sleep(2)
+                log.info('Configuring CORD OLT access device information')
+                OnosCtrl.cord_olt_config(self.olt.olt_device_data())
+                self.activate_apps(self.olt_apps)
+
+          self.activate_apps(self.apps)
 
       def teardown(self):
           '''Deactivate the dhcp app'''
@@ -179,6 +179,13 @@
               onos_ctrl = OnosCtrl(app)
               onos_ctrl.deactivate()
 
+      def activate_apps(self, apps):
+            for app in self.olt_apps:
+                  onos_ctrl = OnosCtrl(app)
+                  status, _ = onos_ctrl.activate()
+                  assert_equal(status, True)
+                  time.sleep(2)
+
       def onos_aaa_load(self):
             if self.aaa_loaded:
                   return
@@ -199,8 +206,7 @@
           self.onos_load_config('org.onosproject.dhcp', dhcp_dict)
 
       def onos_load_config(self, app, config):
-          onos_ctrl = OnosCtrl(app)
-          status, code = onos_ctrl.config(config)
+          status, code = OnosCtrl.config(config)
           if status is False:
              log.info('JSON config request for app %s returned status %d' %(app, code))
              assert_equal(status, True)