commit ff35fb3bc5cf942db95e64bc0eeb57724602aded
author Nikolay Titov <nikolay.titov@nokia.com> Sun Sep 24 13:33:29 2017 -0400
committer Sergio Slobodrian <sslobodr@ciena.com> Thu Sep 28 09:11:41 2017 -0700
tree 9f8f4e69c9ed853360d478b48d32f3bd4749cf59
parent db61c6ac7bd8e8d734bdeaa03e0365c5100d8434

VOL-465: Creation of duplicate OLT devices based on address information should not be allowed.

Creation of duplicated OLT devices identified based on address information (e.g. MAC, IPv4, IPv6, Host-Port) must be prevented and command creating the duplicate OLT device must be rejected. For example, running two following commands in CLI for creation of ponsim OLT with Host-Port address information:

preprovision_olt -t ponsim_olt -H 172.17.0.1:50060
preprovision_olt -t ponsim_olt -H 172.17.0.1:50060

The second command must be rejected and should not create second OLT device.

Change-Id: I0ce9fc12a95607bf2e1c4f27c55ace6806481100

voltha/core/local_handler.py

diff --git a/voltha/core/local_handler.py b/voltha/core/local_handler.py
index 2b50ef9..70f3ecd 100644
--- a/voltha/core/local_handler.py
+++ b/voltha/core/local_handler.py
@@ -289,6 +289,7 @@
 
         known_device_types = dict(
             (dt.id, dt) for dt in self.root.get('/device_types'))
+        known_devices = self.root.get('/devices')
 
         try:
             assert isinstance(request, Device)
@@ -300,7 +301,24 @@
                                           AdminState.PREPROVISIONED), \
                 'Newly created device cannot be ' \
                 'in admin state \'{}\''.format(device.admin_state)
-
+            assert device.WhichOneof("address") is not None, \
+                'Device must have one contact address e.g. MAC, IPv4, IPv6, H&P'
+            error_message = 'Device with {} address \'{}\' already exists'
+            for _device in known_devices:
+                if _device.HasField(device.WhichOneof("address")):
+                    if device.HasField("mac_address"):
+                        assert device.mac_address != _device.mac_address, \
+                            error_message.format('MAC', device.mac_address)
+                    elif device.HasField("ipv4_address"):
+                        assert device.ipv4_address != _device.ipv4_address, \
+                            error_message.format('IPv4', device.ipv4_address)
+                    elif device.HasField("ipv6_address"):
+                        assert device.ipv6_address != _device.ipv6_address, \
+                            error_message.format('IPv6', device.ipv6_address)
+                    elif device.HasField("host_and_port"):
+                        assert device.host_and_port != _device.host_and_port, \
+                            error_message.format('Host and Port',
+                                                 device.host_and_port)
         except AssertionError, e:
             context.set_details(e.message)
             context.set_code(StatusCode.INVALID_ARGUMENT)