if (mode != null) {
if (isDefaultContainer) {
if (!mode.isValid()) {
- return new Status(StatusCode.NOTACCEPTABLE, "Invalid Forwarding Mode Value.");
+ return new Status(StatusCode.BADREQUEST, "Invalid Forwarding Mode Value.");
}
} else {
return new Status(StatusCode.NOTACCEPTABLE,
}
Node node = Node.fromString(nodeId);
Map<String, Property> propMapCurr = nodeProps.get(node);
- Map<String, Property> propMap = new HashMap<String, Property>(propMapCurr);
if (propMapCurr == null) {
return new Status(StatusCode.SUCCESS);
}
+ Map<String, Property> propMap = new HashMap<String, Property>(propMapCurr);
if (!prevNodeProperties.isEmpty()) {
for (String prop : prevNodeProperties.keySet()) {
if (!updateProperties.containsKey(prop)) {
spanConfigList), spanFileName);
retS = objWriter.write(new ConcurrentHashMap<String, SwitchConfig>(
nodeConfigList), switchConfigFileName);
-
if (retS.equals(retP)) {
if (retS.isSuccess()) {
return retS;
} else {
result = nodeProps.replace(node, propMapCurr, propMap);
}
-
if (!result) {
log.debug("Cluster conflict: Conflict while adding the node properties. Node: {} Properties: {}",
node.getID(), props);
: new HashMap<String, Property>(propMapCurr);
// copy node properties from plugin
+ String nodeId = node.toString();
for (Property prop : props) {
+ if (nodeConfigList != null) {
+ SwitchConfig conf = nodeConfigList.get(nodeId);
+ if (conf != null && (conf.getNodeProperties() != null)
+ && conf.getNodeProperties().containsKey(prop.getName())) {
+ continue;
+ }
+ }
propMap.put(prop.getName(), prop);
}
nodeProperties.put(desc.getName(), desc);
Property nodeTier = new Tier(Integer.parseInt(tier));
nodeProperties.put(nodeTier.getName(), nodeTier);
- Property mode = new ForwardingMode(Integer.parseInt(operationMode));
- nodeProperties.put(mode.getName(), mode);
+ if (containerName.equals(GlobalConstants.DEFAULT.toString())) {
+ Property mode = new ForwardingMode(Integer.parseInt(operationMode));
+ nodeProperties.put(mode.getName(), mode);
+ }
SwitchConfig cfg = new SwitchConfig(nodeId, nodeProperties);
Status result = switchManager.updateNodeConfig(cfg);
if (!result.isSuccess()) {
var h3;
var footer = [];
var $body = one.f.switchmanager.nodesLearnt.modal.body.updateNode(nodeId, evt.target.switchDetails, tiers);
- if ( (one.main.registry == undefined || one.main.registry.container == 'default') && evt.target.privilege == 'WRITE'){
+ if (evt.target.privilege == 'WRITE'){
h3 = "Update Node Information";
footer = one.f.switchmanager.nodesLearnt.modal.footer.updateNode();
} else { //disable node edit
$body.find('*').attr('disabled', 'disabled');
h3 = 'Node Information';
}
-
+
var $modal = one.lib.modal.spawn(one.f.switchmanager.nodesLearnt.id.modal.modal, h3, "", footer);
// bind save button
$('#' + one.f.switchmanager.nodesLearnt.id.modal.save, $modal).click(function() {
var $select = one.lib.form.select.create(
["Allow reactive forwarding", "Proactive forwarding only"]);
$select.attr('id', one.f.switchmanager.nodesLearnt.id.modal.form.operationMode);
+ if ((one.main.registry != undefined) && (one.main.registry.container != 'default')) {
+ $select.attr("disabled", true);
+ }
$select.val(switchDetails["mode"]);
$fieldset.append($label).append($select);
$form.append($fieldset);