masterKey terminology applied

openthread · Aug 26, 2020 · d83733c · d83733c
1 parent e0835d9
commit d83733c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/src/rest/frontend/res/js/app.js b/src/rest/frontend/res/js/app.js
@@ -105,7 +105,7 @@
             extPanId: '1111111122222222',
             panId: '0x1234',
             passphrase: '123456',
-            networkKey: '00112233445566778899aabbccddeeff',
+            masterKey: '00112233445566778899aabbccddeeff',
             channel: 15,
             prefix: 'fd11:22::',
             defaultRoute: true,
@@ -268,7 +268,7 @@
             var networkInfo = sharedProperties.getNetworkInfo();
             $scope.isDisplay = false;
             $scope.thread = {
-                networkKey: '00112233445566778899aabbccddeeff',
+                masterKey: '00112233445566778899aabbccddeeff',
                 prefix: 'fd11:22::',
                 defaultRoute: true,
             };
@@ -319,7 +319,7 @@
                 };
                 $scope.isDisplay = true;
                 var data = {
-                    networkKey: $scope.thread.networkKey,
+                    masterKey: $scope.thread.masterKey,
                     prefix: $scope.thread.prefix,
                     defaultRoute: $scope.thread.defaultRoute,
                     index: index,
@@ -373,7 +373,7 @@
                     $scope.thread.defaultRoute = false;
                 };
                 var data = {
-                    networkKey: $scope.thread.networkKey,
+                    masterKey: $scope.thread.masterKey,
                     prefix: $scope.thread.prefix,
                     defaultRoute: $scope.thread.defaultRoute,
                     extPanId: $scope.thread.extPanId,

diff --git a/src/rest/json.cpp b/src/rest/json.cpp
@@ -636,9 +636,9 @@ bool JsonString2NetworkConfiguration(std::string aString, NetworkConfiguration &
     bool   ret = true;
 
     jsonOut = cJSON_Parse(aString.c_str());
-    value   = cJSON_GetObjectItemCaseSensitive(jsonOut, "networkKey");
+    value   = cJSON_GetObjectItemCaseSensitive(jsonOut, "masterKey");
     VerifyOrExit(cJSON_IsString(value) && (value->valuestring != nullptr), ret = false);
-    aNetwork.mNetworkKey = std::string(value->valuestring);
+    aNetwork.mMasterKey = std::string(value->valuestring);
 
     value = cJSON_GetObjectItemCaseSensitive(jsonOut, "prefix");
     VerifyOrExit(cJSON_IsString(value) && (value->valuestring != nullptr), ret = false);

diff --git a/src/rest/resource.cpp b/src/rest/resource.cpp
@@ -513,7 +513,7 @@ void Resource::PutCurrentNetworkCallback(const Request &aRequest, Response &aRes
     std::string     requestBody;
     otExtendedPanId extPanid;
     long            panid;
-    std::string     networkKey, prefix, extPanId, networkName, panId;
+    std::string     masterKey, prefix, extPanId, networkName, panId;
     int32_t         channel;
     char *          endptr;
     bool            defaultRoute;
@@ -528,8 +528,8 @@ void Resource::PutCurrentNetworkCallback(const Request &aRequest, Response &aRes
 
     requestBody = aRequest.GetBody();
 
-    VerifyOrExit(Json::JsonString2String(requestBody, std::string("networkKey"), networkKey),
-                 error = PostError::kPostBadRequest, errorDescription = "Failed at decode json : networkKey");
+    VerifyOrExit(Json::JsonString2String(requestBody, std::string("masterKey"), masterKey),
+                 error = PostError::kPostBadRequest, errorDescription = "Failed at decode json : masterKey");
     VerifyOrExit(Json::JsonString2Bool(requestBody, std::string("defaultRoute"), defaultRoute),
                  error = PostError::kPostBadRequest, errorDescription = "Failed at decode json : defaultRoute");
     VerifyOrExit(Json::JsonString2String(requestBody, std::string("prefix"), prefix),
@@ -542,7 +542,7 @@ void Resource::PutCurrentNetworkCallback(const Request &aRequest, Response &aRes
                  errorDescription = "Failed at decode json : channel");
     VerifyOrExit(Json::JsonString2String(requestBody, std::string("panId"), panId), error = PostError::kPostBadRequest,
                  errorDescription = "Failed at decode json : panId");
-    VerifyOrExit(otbr::Utils::Hex2Bytes(networkKey.c_str(), masterKey.m8, sizeof(masterKey.m8)) == OT_MASTER_KEY_SIZE,
+    VerifyOrExit(otbr::Utils::Hex2Bytes(masterKey.c_str(), masterKey.m8, sizeof(masterKey.m8)) == OT_MASTER_KEY_SIZE,
                  error = PostError::kPostBadRequest, errorDescription = "Failed at encode masterkey : not valid");
 
     // Set Master Key
@@ -1021,7 +1021,7 @@ void Resource::PostNetworksCallback(const Request &aRequest, Response &aResponse
     otbr::Utils::Bytes2Hex(psk.ComputePskc(extPanIdBytes, network.mNetworkName.c_str(), network.mPassphrase.c_str()),
                            OT_PSKC_MAX_LENGTH, pskcStr);
 
-    VerifyOrExit(otbr::Utils::Hex2Bytes(network.mNetworkKey.c_str(), masterKey.m8, sizeof(masterKey.m8)) ==
+    VerifyOrExit(otbr::Utils::Hex2Bytes(network.mMasterKey.c_str(), masterKey.m8, sizeof(masterKey.m8)) ==
                      OT_MASTER_KEY_SIZE,
                  error = PostError::kPostBadRequest, errorDescription = "Failed at encode masterkey : not valid");
     // Set Master Key

diff --git a/src/rest/types.hpp b/src/rest/types.hpp
@@ -119,7 +119,7 @@ struct NetworkConfiguration
 {
     bool        mDefaultRoute;
     uint8_t     mChannel;
-    std::string mNetworkKey;
+    std::string mMasterKey;
     std::string mPrefix;
     std::string mNetworkName;
     std::string mPanId;

diff --git a/tests/rest/test_rest.py b/tests/rest/test_rest.py
@@ -510,7 +510,7 @@ def form_network_test():
         'extPanId': '1111111122222222',
         'panId': '0x1234',
         'passphrase': '123456',
-        'networkKey': '00112233445566778899aabbccddeeff',
+        'masterKey': '00112233445566778899aabbccddeeff',
         'channel': 15,
         'prefix': 'fd11:22::',
         'defaultRoute': True,
@@ -556,7 +556,7 @@ def join():
         'panId': '0xface',
         'channel': 20,
         'networkName': 'hello',
-        'networkKey': '10112233445566778899aabbccddeefe',
+        'masterKey': '10112233445566778899aabbccddeefe',
         'defaultRoute': False,
         "prefix": 'fd17:22::'
     }
@@ -567,7 +567,7 @@ def join():
 
     body = response.read()
     data = json.loads(body)
-    assert data['networkKey'] == '10112233445566778899aabbccddeefe'
+    assert data['masterKey'] == '10112233445566778899aabbccddeefe'
 
     time.sleep(10)