Unifying ONOSes in rcord-lite
Change-Id: Id870d2b339334b98ae36896768e834b4e85c1d16
diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index 4d2f203..f31b2d9 100644
--- a/Dockerfile.synchronizer
+++ b/Dockerfile.synchronizer
@@ -12,8 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# docker build -t xosproject/vrouter-synchronizer:candidate -f Dockerfile.synchronizer .
+
# xosproject/vrouter-synchronizer
-FROM xosproject/xos-synchronizer-base:2.0.0
+FROM xosproject/xos-synchronizer-base:master
COPY xos/synchronizer /opt/xos/synchronizers/vrouter
COPY VERSION /opt/xos/synchronizers/vrouter/
diff --git a/xos/synchronizer/steps/sync_routes.py b/xos/synchronizer/steps/sync_routes.py
index 96bbac4..0293a14 100644
--- a/xos/synchronizer/steps/sync_routes.py
+++ b/xos/synchronizer/steps/sync_routes.py
@@ -31,8 +31,8 @@
# Get fabric service info
def get_onos_fabric_service(self, model):
vrouter_service = model.vrouter.owner
- fabric_service = vrouter_service.subscriber_services[0]
- onos_fabric_service = fabric_service.subscriber_services[0]
+ fabric_service = vrouter_service.provider_services[0]
+ onos_fabric_service = fabric_service.provider_services[0]
return onos_fabric_service
diff --git a/xos/synchronizer/steps/test_sync_routes.py b/xos/synchronizer/steps/test_sync_routes.py
index baa1ba9..1e227a2 100644
--- a/xos/synchronizer/steps/test_sync_routes.py
+++ b/xos/synchronizer/steps/test_sync_routes.py
@@ -93,11 +93,11 @@
self.fabric = Mock()
self.fabric.name = "fabric"
- self.fabric.subscriber_services = [onos_fabric_base]
+ self.fabric.provider_services = [onos_fabric_base]
self.vrouter = Mock()
self.vrouter.name = "vrouter"
- self.vrouter.subscriber_services = [self.fabric]
+ self.vrouter.provider_services = [self.fabric]
# create a mock VRouterStaticRoute instance
self.o = Mock()