Pre-merge code fixes and cleanup

src/common/tools/descriptor/Loader.py

@@ -425,7 +425,7 @@ class DescriptorLoader:
         assert len(response.links) == self.num_links
 
         response = self.__ctx_cli.GetOpticalLinkList(Empty())
-        assert len(response.optical_links) == self.num_links
+        assert len(response.optical_links) == self.num_optical_links
 
         for context_uuid, num_services in self.num_services.items():
             response = self.__ctx_cli.ListServices(ContextId(**json_context_id(context_uuid)))