Skip to content

Commit

Permalink
Merge pull request #1290 from mohamed-shahid-afrid/sprnt-76-odim-dupl…
Browse files Browse the repository at this point in the history
…icate

Removing duplicate parameter and removing fmt statements
  • Loading branch information
amar-shalgar authored Aug 14, 2023
2 parents 55c76c0 + 3736c65 commit 1c16be5
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ data:
{
"RootServiceUUID": {{ .Values.dellplugin.dellPluginRootServiceUUID | quote }},
"LogLevel": {{ .Values.dellplugin.logLevel | quote }},
"LogFormat": {{ .Values.dellplugin.logFormat | quote }},
"logsRedirectionToConsole" : {{ .Values.dellplugin.logsOnConsole | default false }},
"LogFormat": {{ .Values.dellplugin.logFormat | quote }},
"logsRedirectionToConsole" : {{ .Values.dellplugin.logsOnConsole | default false }},
"PluginConf": {
"ID": "DELL",
"Host": {{ .Values.dellplugin.host | quote }},
Expand Down Expand Up @@ -45,7 +45,6 @@ data:
"LBHost": {{ .Values.dellplugin.lbHost | quote }},
"LBPort": {{ .Values.dellplugin.lbPort | quote }}
},
"logsRedirectionToConsole" : {{ .Values.odimra.logsOnConsole | default false }},
"MessageBusConf": {
"MessageBusConfigFilePath": "/etc/dellplugin_config/platformconfig.toml",
"MessageBusType": "Kafka",
Expand Down
1 change: 0 additions & 1 deletion plugin-dell/dphandler/subscribeEvents.go
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ func isOurSubscription(ctxt context.Context, device *dputilities.RedfishDevice)
l.LogWithFields(ctxt).Error(err.Error())
return false
}
fmt.Printf("************ %+v \n ", evtConfig.Data.LoadBalancerConf.Host+":"+evtConfig.Data.LoadBalancerConf.Port)
subscriptionDestinationFromDevice := subscriptionBody.(map[string]interface{})["Destination"].(string)
// if the subscription is ours then the destination should match with LBHOST:LBPORT.
//If it is not matching then retrun with MethodNotAllowed
Expand Down
2 changes: 0 additions & 2 deletions svc-aggregation/rpc/aggregator.go
Original file line number Diff line number Diff line change
Expand Up @@ -333,15 +333,13 @@ func (a *Aggregator) AddAggregationSource(ctx context.Context, req *aggregatorpr
generateResponse(authResp, resp)
return resp, nil
}
fmt.Println("AddAggregationSource********")
sessionUserName, err := a.connector.GetSessionUserName(ctx, req.SessionToken)
if err != nil {
errMsg := "Unable to get session username: " + err.Error()
generateResponse(common.GeneralError(http.StatusUnauthorized, response.NoValidSession, errMsg, nil, nil), resp)
l.LogWithFields(ctx).Error(errMsg)
return resp, nil
}
fmt.Println("session AddAggregationSource********", sessionUserName)
// parsing the AggregationSourceRequest
var addRequest system.AggregationSource
err = json.Unmarshal(req.RequestBody, &addRequest)
Expand Down
1 change: 0 additions & 1 deletion svc-systems/systems/getresource.go
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,6 @@ func SearchAndFilter(ctx context.Context, paramStr []string, resp response.RPC)
for _, element := range submatchall {
element = strings.Trim(element, "(")
element = strings.Trim(element, ")")
fmt.Println(element)
if strings.Contains(element, " and ") || strings.Contains(element, " or ") {
var x []string
if strings.Contains(element, " and ") {
Expand Down

0 comments on commit 1c16be5

Please sign in to comment.