Fix subnet mocking, related to #2510
Merge pull request #2518 from drcapulet/master

Fix subnet mocking, related to #2510