commit 51d242a2816907d4a36788d97e93129e72269890
author Steve DiBenedetto <dibenede@cs.colostate.edu> Mon Mar 31 13:46:43 2014 -0600
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Mar 31 18:18:47 2014 -0700
tree affd47c6c80a1ccc692c73c38ecda8fd852d93ae
parent 98e29f473165d9a641c4e6b08931d572d0fdc034

mgmt: refactor management modules to use ControlCommand

Change-Id: Icf5e10f2f2d0b95c85fd871e6484c3ed58ed6c46

tests/mgmt/face-manager.cpp

diff --git a/tests/mgmt/face-manager.cpp b/tests/mgmt/face-manager.cpp
index d439ea4..1c3734d 100644
--- a/tests/mgmt/face-manager.cpp
+++ b/tests/mgmt/face-manager.cpp
@@ -899,7 +899,6 @@
   FaceTableFixture::m_faceTable.add(dummy);
 
   ControlParameters parameters;
-  parameters.setFaceId(dummy->getId());
   parameters.setLocalControlFeature(LOCAL_CONTROL_FEATURE_INCOMING_FACE_ID);
 
   Block encodedParameters(parameters.wireEncode());
@@ -966,7 +965,7 @@
 
   TestFaceManagerCommon::m_face->onReceiveData +=
     bind(&LocalControlFixture::validateControlResponse, this, _1,
-         enableCommand->getName(), 410, "Requested face not found");
+         enableCommand->getName(), 410, "Face not found");
 
   onValidatedFaceRequest(enableCommand);
 
@@ -987,7 +986,7 @@
 
   TestFaceManagerCommon::m_face->onReceiveData +=
     bind(&LocalControlFixture::validateControlResponse, this, _1,
-         disableCommand->getName(), 410, "Requested face not found");
+         disableCommand->getName(), 410, "Face not found");
 
   onValidatedFaceRequest(disableCommand);
 
@@ -1004,7 +1003,6 @@
   FaceTableFixture::m_faceTable.add(dummy);
 
   ControlParameters parameters;
-  parameters.setFaceId(dummy->getId());
 
   Block encodedParameters(parameters.wireEncode());
 
@@ -1056,7 +1054,6 @@
   FaceTableFixture::m_faceTable.add(dummy);
 
   ControlParameters parameters;
-  parameters.setFaceId(dummy->getId());
   parameters.setLocalControlFeature(LOCAL_CONTROL_FEATURE_INCOMING_FACE_ID);
 
   Block encodedParameters(parameters.wireEncode());
@@ -1071,7 +1068,7 @@
 
   TestFaceManagerCommon::m_face->onReceiveData +=
     bind(&LocalControlFixture::validateControlResponse, this, _1,
-         enableCommand->getName(), 412, "Requested face is non-local");
+         enableCommand->getName(), 412, "Face is non-local");
 
   onValidatedFaceRequest(enableCommand);
 
@@ -1090,7 +1087,7 @@
 
   TestFaceManagerCommon::m_face->onReceiveData +=
     bind(&LocalControlFixture::validateControlResponse, this, _1,
-         disableCommand->getName(), 412, "Requested face is non-local");
+         disableCommand->getName(), 412, "Face is non-local");
 
   onValidatedFaceRequest(disableCommand);
 
@@ -1105,7 +1102,6 @@
   FaceTableFixture::m_faceTable.add(dummy);
 
   ControlParameters parameters;
-  parameters.setFaceId(dummy->getId());
   parameters.setLocalControlFeature(LOCAL_CONTROL_FEATURE_NEXT_HOP_FACE_ID);
 
   Block encodedParameters(parameters.wireEncode());
@@ -1173,7 +1169,7 @@
 
   TestFaceManagerCommon::m_face->onReceiveData +=
     bind(&LocalControlFixture::validateControlResponse, this, _1,
-         enableCommand->getName(), 410, "Requested face not found");
+         enableCommand->getName(), 410, "Face not found");
 
   onValidatedFaceRequest(enableCommand);
 
@@ -1195,7 +1191,7 @@
 
   TestFaceManagerCommon::m_face->onReceiveData +=
     bind(&LocalControlFixture::validateControlResponse, this, _1,
-         disableCommand->getName(), 410, "Requested face not found");
+         disableCommand->getName(), 410, "Face not found");
 
   onValidatedFaceRequest(disableCommand);
 
@@ -1212,7 +1208,6 @@
   FaceTableFixture::m_faceTable.add(dummy);
 
   ControlParameters parameters;
-  parameters.setFaceId(dummy->getId());
   parameters.setLocalControlFeature(LOCAL_CONTROL_FEATURE_NEXT_HOP_FACE_ID);
 
   Block encodedParameters(parameters.wireEncode());
@@ -1227,7 +1222,7 @@
 
   TestFaceManagerCommon::m_face->onReceiveData +=
     bind(&LocalControlFixture::validateControlResponse, this, _1,
-         enableCommand->getName(), 412, "Requested face is non-local");
+         enableCommand->getName(), 412, "Face is non-local");
 
   onValidatedFaceRequest(enableCommand);
 
@@ -1246,7 +1241,7 @@
 
   TestFaceManagerCommon::m_face->onReceiveData +=
     bind(&LocalControlFixture::validateControlResponse, this, _1,
-         disableCommand->getName(), 412, "Requested face is non-local");
+         disableCommand->getName(), 412, "Face is non-local");
 
   onValidatedFaceRequest(disableCommand);
 
@@ -1482,7 +1477,6 @@
   FaceTableFixture::m_faceTable.add(dummy);
 
   ControlParameters parameters;
-  parameters.setUri("tcp://127.0.0.1");
   parameters.setFaceId(dummy->getId());
 
   Block encodedParameters(parameters.wireEncode());