- fix test_contrail_plugin.py to make unit test pass
- removed unwanted code