diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-08 07:25:11 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-08 07:25:11 +0000 |
| commit | d33821757f5bca0cc9c52713d94fe5a9c8af3211 (patch) | |
| tree | d02cb7e26dbe57b8b66ff3f84f07fd4b4cb4dc83 | |
| parent | 20ab733813d5ef723708cab5d75a4d58ef92159d (diff) | |
| parent | 2041e4724d6e84fe161ec78f68b7fc1afdf63d47 (diff) | |
| download | netd-d33821757f5bca0cc9c52713d94fe5a9c8af3211.tar.gz | |
release-request-c8b8af6b-4899-402a-9ff7-72255ba5300b-for-git_oc-mr1-release-4253898 snap-temp-L09600000090287887
Change-Id: I89b7a45d2ba0f3e26fb5e91682d90e512aafe052
| -rw-r--r-- | netutils_wrappers/NetUtilsWrapper-1.0.cpp | 6 | ||||
| -rw-r--r-- | netutils_wrappers/NetUtilsWrapperTest-1.0.cpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/netutils_wrappers/NetUtilsWrapper-1.0.cpp b/netutils_wrappers/NetUtilsWrapper-1.0.cpp index a9fbf3fb..ccf32add 100644 --- a/netutils_wrappers/NetUtilsWrapper-1.0.cpp +++ b/netutils_wrappers/NetUtilsWrapper-1.0.cpp @@ -52,9 +52,9 @@ const char *netcmds[] = { const char *EXPECTED_REGEXPS[] = { #define CMD "^" SYSTEM_DIRNAME // Create, delete, and manage OEM networks. - CMD "ndc network (create|destroy) oem[0-9]+( |$)", - CMD "ndc network interface (add|remove) oem[0-9]+ " VENDOR_IFACE, - CMD "ndc network route (add|remove) oem[0-9]+ ", + CMD "ndc network (create|destroy) (oem|handle)[0-9]+( |$)", + CMD "ndc network interface (add|remove) (oem|handle)[0-9]+ " VENDOR_IFACE, + CMD "ndc network route (add|remove) (oem|handle)[0-9]+ ", CMD "ndc ipfwd (enable|disable) ", CMD "ndc ipfwd (add|remove) .*" VENDOR_IFACE, diff --git a/netutils_wrappers/NetUtilsWrapperTest-1.0.cpp b/netutils_wrappers/NetUtilsWrapperTest-1.0.cpp index a32cc3b7..4f47c78b 100644 --- a/netutils_wrappers/NetUtilsWrapperTest-1.0.cpp +++ b/netutils_wrappers/NetUtilsWrapperTest-1.0.cpp @@ -47,6 +47,10 @@ std::vector<Command> COMMANDS = { {VALID, "/system/bin/ndc network interface add oem10 oem9"}, {INVALID, "/system/bin/ndc network interface add 100 v_oem9"}, {VALID, "/system/bin/ndc network interface add oem10 r_rmnet_data0"}, + {VALID, "/system/bin/ndc network interface add handle42966108894 v_oem9"}, + {VALID, "/system/bin/ndc network interface add handle42966108894 oem9"}, + {VALID, "/system/bin/ndc network interface add handle42966108894 r_rmnet_data0"}, + {INVALID, "/system/bin/ndc network interface add handle42966108894"}, {VALID, "/system/bin/ip xfrm state"}, }; |