Merge "Use self.create_port instead of client.create_port"