commit f40551a061fd28e7cc420ed7e005efc5aa311474
author Eric Newberry <enewberry@email.arizona.edu> Mon Sep 05 15:41:16 2016 -0700
committer Eric Newberry <enewberry@email.arizona.edu> Fri Sep 23 01:16:23 2016 -0700
tree ec287121e64ef7cc395eec775fa41dbdc5b3b8c1
parent d8205106ccc9f0a0e98266d3f68973d2154831aa

face+mgmt: enable local fields through ProtocolFactory::createFace

refs #3731

Change-Id: I569dae59cda150ffcb1c0ff1d01a575d8850beca

tests/daemon/mgmt/face-manager-create-face.t.cpp

diff --git a/tests/daemon/mgmt/face-manager-create-face.t.cpp b/tests/daemon/mgmt/face-manager-create-face.t.cpp
index c691491..ed89388 100644
--- a/tests/daemon/mgmt/face-manager-create-face.t.cpp
+++ b/tests/daemon/mgmt/face-manager-create-face.t.cpp
@@ -120,6 +120,58 @@
   }
 };
 
+class LocalTcpFaceLocalFieldsEnabled
+{
+public:
+  ControlParameters
+  getParameters()
+  {
+    return ControlParameters()
+      .setUri("tcp4://127.0.0.1:26363")
+      .setFacePersistency(ndn::nfd::FACE_PERSISTENCY_PERSISTENT)
+      .setFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED, true);
+  }
+};
+
+class LocalTcpFaceLocalFieldsDisabled
+{
+public:
+  ControlParameters
+  getParameters()
+  {
+    return ControlParameters()
+      .setUri("tcp4://127.0.0.1:26363")
+      .setFacePersistency(ndn::nfd::FACE_PERSISTENCY_PERSISTENT)
+      .setFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED, false);
+  }
+};
+
+class NonLocalUdpFaceLocalFieldsEnabled // won't work because non-local scope
+{
+public:
+  ControlParameters
+  getParameters()
+  {
+    return ControlParameters()
+      .setUri("udp4://127.0.0.1:26363")
+      .setFacePersistency(ndn::nfd::FACE_PERSISTENCY_PERSISTENT)
+      .setFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED, true);
+  }
+};
+
+class NonLocalUdpFaceLocalFieldsDisabled
+{
+public:
+  ControlParameters
+  getParameters()
+  {
+    return ControlParameters()
+      .setUri("udp4://127.0.0.1:26363")
+      .setFacePersistency(ndn::nfd::FACE_PERSISTENCY_PERSISTENT)
+      .setFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED, false);
+  }
+};
+
 namespace mpl = boost::mpl;
 
 // pairs of CreateCommand and Success/Failure status
@@ -129,7 +181,11 @@
                     mpl::pair<UdpFaceOnDemand, CommandFailure<406>>,
                     mpl::pair<UdpFacePersistent, CommandSuccess>,
                     mpl::pair<UdpFacePermanent, CommandSuccess>,
-                    mpl::pair<UdpFaceConnectToSelf, CommandFailure<406>>> Faces;
+                    mpl::pair<UdpFaceConnectToSelf, CommandFailure<406>>,
+                    mpl::pair<LocalTcpFaceLocalFieldsEnabled, CommandSuccess>,
+                    mpl::pair<LocalTcpFaceLocalFieldsDisabled, CommandSuccess>,
+                    mpl::pair<NonLocalUdpFaceLocalFieldsEnabled, CommandFailure<406>>,
+                    mpl::pair<NonLocalUdpFaceLocalFieldsDisabled, CommandSuccess>> Faces;
 
 BOOST_FIXTURE_TEST_CASE_TEMPLATE(NewFace, T, Faces, FaceManagerCommandFixture)
 {
@@ -162,10 +218,12 @@
 
       if (actual.getCode() == 200) {
         if (expectedParams.hasFlags()) {
-          // TODO: #3731 check if Flags match
+          BOOST_CHECK_EQUAL(expectedParams.getFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED),
+                            actualParams.getFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED));
         }
         else {
-          // TODO: #3731 check if Flags at defaults
+          // local fields are disabled by default
+          BOOST_CHECK_EQUAL(actualParams.getFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED), false);
         }
       }
       else {
@@ -193,7 +251,7 @@
 
 
 typedef mpl::vector<// mpl::pair<mpl::pair<TcpFacePersistent, TcpFacePermanent>, TcpFacePermanent>, // no need to check now
-                    // mpl::pair<mpl::pair<TcpFacePermanent, TcpFacePersistent>, TcpFacePermanent>, // no need to check now
+                    // mpl::pair<mpl::pair<TcpFacePermanent, TcpFacePersistent>, TcpFacePersistent>, // no need to check now
                     mpl::pair<mpl::pair<UdpFacePersistent, UdpFacePermanent>, UdpFacePermanent>,
                     mpl::pair<mpl::pair<UdpFacePermanent, UdpFacePersistent>, UdpFacePermanent>> FaceTransitions;
 
@@ -235,6 +293,7 @@
 
         ControlResponse actual(response.getContent().blockFromValue());
         BOOST_REQUIRE_EQUAL(actual.getCode(), 200);
+        BOOST_TEST_MESSAGE(actual.getText());
 
         ControlParameters expectedParams(FinalFaceType().getParameters());
         ControlParameters actualParams(actual.getBody());

tests/daemon/mgmt/face-manager.t.cpp

diff --git a/tests/daemon/mgmt/face-manager.t.cpp b/tests/daemon/mgmt/face-manager.t.cpp
index 3c34cb2..9b7c71a 100644
--- a/tests/daemon/mgmt/face-manager.t.cpp
+++ b/tests/daemon/mgmt/face-manager.t.cpp
@@ -335,6 +335,7 @@
   virtual void
   createFace(const FaceUri& uri,
              ndn::nfd::FacePersistency persistency,
+             bool wantLocalFieldsEnabled,
              const FaceCreatedCallback& onCreated,
              const FaceCreationFailedCallback& onConnectFailed) override
   {