refactoring openstackadapter