Fixed the issues

* Split the types for contrail control and router provisioning
* fixed the indentation errors and code issues