Commit 7ea63f6d authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent 4b408a28

proto/ztp_server.proto

+0 −10
Original line number Diff line number Diff line
@@ -39,13 +39,3 @@ message ProvisioningScript { 
message ZtpFile {

  string json = 1;

}
 


message SocketID {

  string host = 1; 

   int32 port = 2 ;

}



message CheckStat {

  int32 res = 1 ;

}

src/common/tools/object_factory/OpticalLink.py

+1 −2
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



import copy  , logging

from common.proto.context_pb2 import TopologyDetails

import copy



def convert_to_dict(single_val:int)->dict:

    slot= dict()

src/device/service/DeviceServiceServicerImpl.py

+7 −3
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ class DeviceServiceServicerImpl(DeviceServiceServicer): 
        # update device_uuid to honor UUID provided by Context

        device_uuid = device.device_id.device_uuid.uuid

        device_name = device.name



        t2 = time.time()



        self.mutex_queues.add_alias(device_uuid, device_name)
@@ -126,8 +127,11 @@ class DeviceServiceServicerImpl(DeviceServiceServicer): 
            else:

                t_pop_endpoints = None



            is_optical_device = (request.device_drivers[0] == DeviceDriverEnum.DEVICEDRIVER_OC

                                 or request.device_drivers[0] == DeviceDriverEnum.DEVICEDRIVER_OPENROADM)

            OPTICAL_DRIVERS = {

                DeviceDriverEnum.DEVICEDRIVER_OC,

                DeviceDriverEnum.DEVICEDRIVER_OPENROADM,

            }

            is_optical_device = request.device_drivers[0] in OPTICAL_DRIVERS

            if len(device.device_config.config_rules) == len(connection_config_rules) and not is_optical_device:

                # created from request, populate config rules using driver

                t7 = time.time()

src/device/service/drivers/openroadm/templates/Provisioning/openroadm.py

+0 −1
Original line number Diff line number Diff line
@@ -356,4 +356,3 @@ def handle_or_deconfiguration (resources): 
            cross_conn_resources["count"]=0      

    edit_templates.extend(delete_mc(mcs_to_delete))                          

    return (edit_templates,interfaces)                
                
 No newline at end of file