Replace "Domain Name" with "Default Gateway"
"Domain Name" is not as important of a network settings as
"Default Gateway". Remove it for now, later we will add fields for
the other network settings but getting the basic network settings
going for now. To setup the network, the user needs to configure
the Default Gateway, MAC Address, IP, Gateway, and netmask.
Change-Id: I27066dc188c3c30a01051b473a7ce10837d40fab
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js
index 5e0cd3c..077d18a 100644
--- a/app/common/services/api-utils.js
+++ b/app/common/services/api-utils.js
@@ -97,6 +97,7 @@
var json = JSON.stringify(response.data);
var content = JSON.parse(json);
var hostname = '';
+ var defaultgateway = '';
var macAddress = '';
function parseNetworkData(content) {
@@ -153,12 +154,19 @@
}
if (content.data.hasOwnProperty(
- '/xyz/openbmc_project/network/config') &&
- content.data['/xyz/openbmc_project/network/config']
- .hasOwnProperty('HostName')) {
- hostname =
- content.data['/xyz/openbmc_project/network/config']
- .HostName;
+ '/xyz/openbmc_project/network/config')) {
+ if (content.data['/xyz/openbmc_project/network/config']
+ .hasOwnProperty('HostName')) {
+ hostname =
+ content.data['/xyz/openbmc_project/network/config']
+ .HostName;
+ }
+ if (content.data['/xyz/openbmc_project/network/config']
+ .hasOwnProperty('DefaultGateway')) {
+ defaultgateway =
+ content.data['/xyz/openbmc_project/network/config']
+ .DefaultGateway;
+ }
}
if (content.data.hasOwnProperty(
@@ -173,6 +181,7 @@
deferred.resolve({
data: content.data,
hostname: hostname,
+ defaultgateway: defaultgateway,
mac_address: macAddress,
formatted_data: parseNetworkData(content)
});
diff --git a/app/configuration/controllers/network-controller.html b/app/configuration/controllers/network-controller.html
index a91f7fa..968f8a2 100644
--- a/app/configuration/controllers/network-controller.html
+++ b/app/configuration/controllers/network-controller.html
@@ -28,8 +28,8 @@
<input id="net-config__host" type="text" ng-model="interface.MACAddress"/>
</div>
<div class="column small-12 large-3">
- <label for="net-config__domain">Domain name</label>
- <input id="net-config__domain" type="text" ng-model="interface.DomainName"/>
+ <label for="net-config__domain">Default Gateway</label>
+ <input id="net-config__domain" type="text" ng-model="defaultgateway"/>
</div>
</fieldset>
</section>
diff --git a/app/configuration/controllers/network-controller.js b/app/configuration/controllers/network-controller.js
index 433bf8c..8acc69e 100644
--- a/app/configuration/controllers/network-controller.js
+++ b/app/configuration/controllers/network-controller.js
@@ -17,6 +17,7 @@
$scope.interface = {};
$scope.networkDevice = false;
$scope.hostname = '';
+ $scope.defaultgateway = '';
$scope.set_network_error = '';
$scope.set_network_success = false;
$scope.selectedInterface = '';
@@ -52,6 +53,7 @@
APIUtils.getNetworkInfo().then(function(data) {
$scope.network = data.formatted_data;
$scope.hostname = data.hostname;
+ $scope.defaultgateway = data.defaultgateway;
if ($scope.network.interface_ids.length) {
$scope.selectedInterface = $scope.network.interface_ids[0];
$scope.interface =