From 2e2f12239894a0bf56fbe6cd910db6e8655228de Mon Sep 17 00:00:00 2001
From: Mateusz Zalega <mateusz.zalega@codilime.com>
Date: Thu, 4 Dec 2014 21:02:02 +0000
Subject: [PATCH] vrouter agent: refactor instance_manager_adapter to meet
 coding standards

Signed-off-by: Mateusz Zalega <mateusz.zalega@codilime.com>
Change-Id: I87a286b76d1cadd3c22080b0f7f770af61c16bca
---
 .../agent/oper/instance_manager_adapter.cc    | 10 +++---
 .../agent/oper/instance_manager_adapter.h     | 36 +++++++++----------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/vnsw/agent/oper/instance_manager_adapter.cc b/src/vnsw/agent/oper/instance_manager_adapter.cc
index 35da884d002..c60f6f0290d 100644
--- a/src/vnsw/agent/oper/instance_manager_adapter.cc
+++ b/src/vnsw/agent/oper/instance_manager_adapter.cc
@@ -63,7 +63,7 @@ InstanceTask* DockerInstanceAdapter::CreateStartTask(const ServiceInstance::Prop
     }
 
 
-    return new InstanceTask(cmd_str.str(), Start, agent_->event_manager());
+    return new InstanceTask(cmd_str.str(), START, agent_->event_manager());
 }
 
 InstanceTask* DockerInstanceAdapter::CreateStopTask(const ServiceInstance::Properties &props) {
@@ -84,7 +84,7 @@ InstanceTask* DockerInstanceAdapter::CreateStopTask(const ServiceInstance::Prope
     if (props.vmi_management != boost::uuids::nil_uuid()) {
         cmd_str << " --vmi-management-id " << UuidToString(props.vmi_management);
     }
-    return new InstanceTask(cmd_str.str(), Stop, agent_->event_manager());
+    return new InstanceTask(cmd_str.str(), STOP, agent_->event_manager());
 }
 
 bool DockerInstanceAdapter::isApplicable(const ServiceInstance::Properties &props) {
@@ -133,7 +133,7 @@ InstanceTask* NetNSInstanceAdapter::CreateStartTask(const ServiceInstance::Prope
         cmd_str << " --update";
     }
 
-    return new InstanceTask(cmd_str.str(), Start, agent_->event_manager());
+    return new InstanceTask(cmd_str.str(), START, agent_->event_manager());
 }
 
 InstanceTask* NetNSInstanceAdapter::CreateStopTask(const ServiceInstance::Properties &props) {
@@ -163,9 +163,9 @@ InstanceTask* NetNSInstanceAdapter::CreateStopTask(const ServiceInstance::Proper
         cmd_str << " --pool-id " << props.pool_id;
     }
 
-    return new InstanceTask(cmd_str.str(), Stop, agent_->event_manager());
+    return new InstanceTask(cmd_str.str(), STOP, agent_->event_manager());
 }
 
 bool NetNSInstanceAdapter::isApplicable(const ServiceInstance::Properties &props) {
     return (props.virtualization_type == ServiceInstance::NetworkNamespace);
-}
\ No newline at end of file
+}
diff --git a/src/vnsw/agent/oper/instance_manager_adapter.h b/src/vnsw/agent/oper/instance_manager_adapter.h
index fd968407188..660c255c04f 100644
--- a/src/vnsw/agent/oper/instance_manager_adapter.h
+++ b/src/vnsw/agent/oper/instance_manager_adapter.h
@@ -7,39 +7,38 @@
 #include "oper/instance_task.h"
 
 class InstanceManagerAdapter {
-    public:
+ public:
     enum CmdType {
-        Start = 1,
-        Stop
+        START = 1,
+        STOP
     };
 
-    virtual InstanceTask* CreateStartTask(const ServiceInstance::Properties &props, bool update) = 0;
-
-    virtual InstanceTask* CreateStopTask(const ServiceInstance::Properties &props) = 0;
+    virtual ~InstanceManagerAdapter() {}
 
+    virtual InstanceTask* CreateStartTask(
+        const ServiceInstance::Properties &props, bool update) = 0;
+    virtual InstanceTask* CreateStopTask(
+        const ServiceInstance::Properties &props) = 0;
     virtual bool isApplicable(const ServiceInstance::Properties &props) = 0;
-
-    virtual ~InstanceManagerAdapter() { }
 };
 
 class DockerInstanceAdapter : public InstanceManagerAdapter {
-    public:
+ public:
     DockerInstanceAdapter(const std::string &docker_cmd,Agent *agent)
                         : docker_cmd_(docker_cmd), agent_(agent) {}
 
-    InstanceTask* CreateStartTask(const ServiceInstance::Properties &props, bool update);
-
+    InstanceTask* CreateStartTask(const ServiceInstance::Properties &props,
+        bool update);
     InstanceTask* CreateStopTask(const ServiceInstance::Properties &props);
-
     bool isApplicable(const ServiceInstance::Properties &props);
 
-    private:
+ private:
     std::string docker_cmd_;
     Agent *agent_;
 };
 
 class NetNSInstanceAdapter : public InstanceManagerAdapter {
-    public:
+ public:
     NetNSInstanceAdapter(const std::string &netns_cmd,
                          const std::string &loadbalancer_config_path,
                          Agent *agent)
@@ -48,16 +47,15 @@ class NetNSInstanceAdapter : public InstanceManagerAdapter {
                           agent_(agent)
                           {}
 
-    InstanceTask* CreateStartTask(const ServiceInstance::Properties &props, bool update);
-
+    InstanceTask* CreateStartTask(const ServiceInstance::Properties &props,
+        bool update);
     InstanceTask* CreateStopTask(const ServiceInstance::Properties &props);
-
     bool isApplicable(const ServiceInstance::Properties &props);
 
-    private:
+ private:
     std::string netns_cmd_;
     std::string loadbalancer_config_path_;
     Agent *agent_;
 };
 
-#endif
\ No newline at end of file
+#endif