Gitiles
Code Review Sign In
gerrit.opencord.org / asfvolt16-driver / aff594a2341301fb6590cabcb35c775ea5d1bf0e / . / asfvolt16_redfish_service / calsoft.patch
blob: 4641634d17b1f353e452bb3c9abd2b7c0e7ada14 [file] [log] [blame]
Santosh Kumaraff594a2017-12-14 18:56:26 +0530[diff] [blame^]1# Copyright 2017-present Open Networking Foundation
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14#
15
16diff -ruN rsd_org/Documents/readme.md rsd_org_calsoft/Documents/readme.md
17--- rsd_org/Documents/readme.md 2017-12-15 06:54:00.000000000 +0530
18+++ rsd_org_calsoft/Documents/readme.md 1970-01-01 05:30:00.000000000 +0530
19@@ -1 +0,0 @@
20-Documents related to implementation of Intel® Rack Scale Design Reference Software
21Binary files rsd_org/Documents/SUSE_Caas_Implementation_Guide.pdf and rsd_org_calsoft/Documents/SUSE_Caas_Implementation_Guide.pdf differ
22diff -ruN rsd_org/.git/config rsd_org_calsoft/.git/config
23--- rsd_org/.git/config 2017-12-19 13:19:16.488042958 +0530
24+++ rsd_org_calsoft/.git/config 1970-01-01 05:30:00.000000000 +0530
25@@ -1,11 +0,0 @@
26-[core]
27- repositoryformatversion = 0
28- filemode = true
29- bare = false
30- logallrefupdates = true
31-[remote "origin"]
32- url = http://code.accton.com.tw/git/rsd.git
33- fetch = +refs/heads/*:refs/remotes/origin/*
34-[branch "RSA-SW-Accton-2.1.3"]
35- remote = origin
36- merge = refs/heads/RSA-SW-Accton-2.1.3
37diff -ruN rsd_org/.git/description rsd_org_calsoft/.git/description
38--- rsd_org/.git/description 2017-12-19 13:19:16.488042958 +0530
39+++ rsd_org_calsoft/.git/description 1970-01-01 05:30:00.000000000 +0530
40@@ -1 +0,0 @@
41-Unnamed repository; edit this file 'description' to name the repository.
42diff -ruN rsd_org/.git/HEAD rsd_org_calsoft/.git/HEAD
43--- rsd_org/.git/HEAD 2017-12-19 13:19:16.488042958 +0530
44+++ rsd_org_calsoft/.git/HEAD 1970-01-01 05:30:00.000000000 +0530
45@@ -1 +0,0 @@
46-ref: refs/heads/RSA-SW-Accton-2.1.3
47diff -ruN rsd_org/.git/hooks/applypatch-msg.sample rsd_org_calsoft/.git/hooks/applypatch-msg.sample
48--- rsd_org/.git/hooks/applypatch-msg.sample 2017-12-19 13:19:16.488042958 +0530
49+++ rsd_org_calsoft/.git/hooks/applypatch-msg.sample 1970-01-01 05:30:00.000000000 +0530
50@@ -1,15 +0,0 @@
51-#!/bin/sh
52-#
53-# An example hook script to check the commit log message taken by
54-# applypatch from an e-mail message.
55-#
56-# The hook should exit with non-zero status after issuing an
57-# appropriate message if it wants to stop the commit. The hook is
58-# allowed to edit the commit message file.
59-#
60-# To enable this hook, rename this file to "applypatch-msg".
61-
62-. git-sh-setup
63-test -x "$GIT_DIR/hooks/commit-msg" &&
64- exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
65-:
66diff -ruN rsd_org/.git/hooks/commit-msg.sample rsd_org_calsoft/.git/hooks/commit-msg.sample
67--- rsd_org/.git/hooks/commit-msg.sample 2017-12-19 13:19:16.488042958 +0530
68+++ rsd_org_calsoft/.git/hooks/commit-msg.sample 1970-01-01 05:30:00.000000000 +0530
69@@ -1,24 +0,0 @@
70-#!/bin/sh
71-#
72-# An example hook script to check the commit log message.
73-# Called by "git commit" with one argument, the name of the file
74-# that has the commit message. The hook should exit with non-zero
75-# status after issuing an appropriate message if it wants to stop the
76-# commit. The hook is allowed to edit the commit message file.
77-#
78-# To enable this hook, rename this file to "commit-msg".
79-
80-# Uncomment the below to add a Signed-off-by line to the message.
81-# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
82-# hook is more suited to it.
83-#
84-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
85-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
86-
87-# This example catches duplicate Signed-off-by lines.
88-
89-test "" = "$(grep '^Signed-off-by: ' "$1" |
90- sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
91- echo >&2 Duplicate Signed-off-by lines.
92- exit 1
93-}
94diff -ruN rsd_org/.git/hooks/post-update.sample rsd_org_calsoft/.git/hooks/post-update.sample
95--- rsd_org/.git/hooks/post-update.sample 2017-12-19 13:19:16.488042958 +0530
96+++ rsd_org_calsoft/.git/hooks/post-update.sample 1970-01-01 05:30:00.000000000 +0530
97@@ -1,8 +0,0 @@
98-#!/bin/sh
99-#
100-# An example hook script to prepare a packed repository for use over
101-# dumb transports.
102-#
103-# To enable this hook, rename this file to "post-update".
104-
105-exec git update-server-info
106diff -ruN rsd_org/.git/hooks/pre-applypatch.sample rsd_org_calsoft/.git/hooks/pre-applypatch.sample
107--- rsd_org/.git/hooks/pre-applypatch.sample 2017-12-19 13:19:16.488042958 +0530
108+++ rsd_org_calsoft/.git/hooks/pre-applypatch.sample 1970-01-01 05:30:00.000000000 +0530
109@@ -1,14 +0,0 @@
110-#!/bin/sh
111-#
112-# An example hook script to verify what is about to be committed
113-# by applypatch from an e-mail message.
114-#
115-# The hook should exit with non-zero status after issuing an
116-# appropriate message if it wants to stop the commit.
117-#
118-# To enable this hook, rename this file to "pre-applypatch".
119-
120-. git-sh-setup
121-test -x "$GIT_DIR/hooks/pre-commit" &&
122- exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
123-:
124diff -ruN rsd_org/.git/hooks/pre-commit.sample rsd_org_calsoft/.git/hooks/pre-commit.sample
125--- rsd_org/.git/hooks/pre-commit.sample 2017-12-19 13:19:16.488042958 +0530
126+++ rsd_org_calsoft/.git/hooks/pre-commit.sample 1970-01-01 05:30:00.000000000 +0530
127@@ -1,49 +0,0 @@
128-#!/bin/sh
129-#
130-# An example hook script to verify what is about to be committed.
131-# Called by "git commit" with no arguments. The hook should
132-# exit with non-zero status after issuing an appropriate message if
133-# it wants to stop the commit.
134-#
135-# To enable this hook, rename this file to "pre-commit".
136-
137-if git rev-parse --verify HEAD >/dev/null 2>&1
138-then
139- against=HEAD
140-else
141- # Initial commit: diff against an empty tree object
142- against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
143-fi
144-
145-# If you want to allow non-ASCII filenames set this variable to true.
146-allownonascii=$(git config --bool hooks.allownonascii)
147-
148-# Redirect output to stderr.
149-exec 1>&2
150-
151-# Cross platform projects tend to avoid non-ASCII filenames; prevent
152-# them from being added to the repository. We exploit the fact that the
153-# printable range starts at the space character and ends with tilde.
154-if [ "$allownonascii" != "true" ] &&
155- # Note that the use of brackets around a tr range is ok here, (it's
156- # even required, for portability to Solaris 10's /usr/bin/tr), since
157- # the square bracket bytes happen to fall in the designated range.
158- test $(git diff --cached --name-only --diff-filter=A -z $against |
159- LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
160-then
161- cat <<\EOF
162-Error: Attempt to add a non-ASCII file name.
163-
164-This can cause problems if you want to work with people on other platforms.
165-
166-To be portable it is advisable to rename the file.
167-
168-If you know what you are doing you can disable this check using:
169-
170- git config hooks.allownonascii true
171-EOF
172- exit 1
173-fi
174-
175-# If there are whitespace errors, print the offending file names and fail.
176-exec git diff-index --check --cached $against --
177diff -ruN rsd_org/.git/hooks/prepare-commit-msg.sample rsd_org_calsoft/.git/hooks/prepare-commit-msg.sample
178--- rsd_org/.git/hooks/prepare-commit-msg.sample 2017-12-19 13:19:16.488042958 +0530
179+++ rsd_org_calsoft/.git/hooks/prepare-commit-msg.sample 1970-01-01 05:30:00.000000000 +0530
180@@ -1,36 +0,0 @@
181-#!/bin/sh
182-#
183-# An example hook script to prepare the commit log message.
184-# Called by "git commit" with the name of the file that has the
185-# commit message, followed by the description of the commit
186-# message's source. The hook's purpose is to edit the commit
187-# message file. If the hook fails with a non-zero status,
188-# the commit is aborted.
189-#
190-# To enable this hook, rename this file to "prepare-commit-msg".
191-
192-# This hook includes three examples. The first comments out the
193-# "Conflicts:" part of a merge commit.
194-#
195-# The second includes the output of "git diff --name-status -r"
196-# into the message, just before the "git status" output. It is
197-# commented because it doesn't cope with --amend or with squashed
198-# commits.
199-#
200-# The third example adds a Signed-off-by line to the message, that can
201-# still be edited. This is rarely a good idea.
202-
203-case "$2,$3" in
204- merge,)
205- /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
206-
207-# ,|template,)
208-# /usr/bin/perl -i.bak -pe '
209-# print "\n" . `git diff --cached --name-status -r`
210-# if /^#/ && $first++ == 0' "$1" ;;
211-
212- *) ;;
213-esac
214-
215-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
216-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
217diff -ruN rsd_org/.git/hooks/pre-push.sample rsd_org_calsoft/.git/hooks/pre-push.sample
218--- rsd_org/.git/hooks/pre-push.sample 2017-12-19 13:19:16.488042958 +0530
219+++ rsd_org_calsoft/.git/hooks/pre-push.sample 1970-01-01 05:30:00.000000000 +0530
220@@ -1,54 +0,0 @@
221-#!/bin/sh
222-
223-# An example hook script to verify what is about to be pushed. Called by "git
224-# push" after it has checked the remote status, but before anything has been
225-# pushed. If this script exits with a non-zero status nothing will be pushed.
226-#
227-# This hook is called with the following parameters:
228-#
229-# $1 -- Name of the remote to which the push is being done
230-# $2 -- URL to which the push is being done
231-#
232-# If pushing without using a named remote those arguments will be equal.
233-#
234-# Information about the commits which are being pushed is supplied as lines to
235-# the standard input in the form:
236-#
237-# <local ref> <local sha1> <remote ref> <remote sha1>
238-#
239-# This sample shows how to prevent push of commits where the log message starts
240-# with "WIP" (work in progress).
241-
242-remote="$1"
243-url="$2"
244-
245-z40=0000000000000000000000000000000000000000
246-
247-IFS=' '
248-while read local_ref local_sha remote_ref remote_sha
249-do
250- if [ "$local_sha" = $z40 ]
251- then
252- # Handle delete
253- :
254- else
255- if [ "$remote_sha" = $z40 ]
256- then
257- # New branch, examine all commits
258- range="$local_sha"
259- else
260- # Update to existing branch, examine new commits
261- range="$remote_sha..$local_sha"
262- fi
263-
264- # Check for WIP commit
265- commit=`git rev-list -n 1 --grep '^WIP' "$range"`
266- if [ -n "$commit" ]
267- then
268- echo "Found WIP commit in $local_ref, not pushing"
269- exit 1
270- fi
271- fi
272-done
273-
274-exit 0
275diff -ruN rsd_org/.git/hooks/pre-rebase.sample rsd_org_calsoft/.git/hooks/pre-rebase.sample
276--- rsd_org/.git/hooks/pre-rebase.sample 2017-12-19 13:19:16.488042958 +0530
277+++ rsd_org_calsoft/.git/hooks/pre-rebase.sample 1970-01-01 05:30:00.000000000 +0530
278@@ -1,169 +0,0 @@
279-#!/bin/sh
280-#
281-# Copyright (c) 2006, 2008 Junio C Hamano
282-#
283-# The "pre-rebase" hook is run just before "git rebase" starts doing
284-# its job, and can prevent the command from running by exiting with
285-# non-zero status.
286-#
287-# The hook is called with the following parameters:
288-#
289-# $1 -- the upstream the series was forked from.
290-# $2 -- the branch being rebased (or empty when rebasing the current branch).
291-#
292-# This sample shows how to prevent topic branches that are already
293-# merged to 'next' branch from getting rebased, because allowing it
294-# would result in rebasing already published history.
295-
296-publish=next
297-basebranch="$1"
298-if test "$#" = 2
299-then
300- topic="refs/heads/$2"
301-else
302- topic=`git symbolic-ref HEAD` ||
303- exit 0 ;# we do not interrupt rebasing detached HEAD
304-fi
305-
306-case "$topic" in
307-refs/heads/??/*)
308- ;;
309-*)
310- exit 0 ;# we do not interrupt others.
311- ;;
312-esac
313-
314-# Now we are dealing with a topic branch being rebased
315-# on top of master. Is it OK to rebase it?
316-
317-# Does the topic really exist?
318-git show-ref -q "$topic" || {
319- echo >&2 "No such branch $topic"
320- exit 1
321-}
322-
323-# Is topic fully merged to master?
324-not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
325-if test -z "$not_in_master"
326-then
327- echo >&2 "$topic is fully merged to master; better remove it."
328- exit 1 ;# we could allow it, but there is no point.
329-fi
330-
331-# Is topic ever merged to next? If so you should not be rebasing it.
332-only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
333-only_next_2=`git rev-list ^master ${publish} | sort`
334-if test "$only_next_1" = "$only_next_2"
335-then
336- not_in_topic=`git rev-list "^$topic" master`
337- if test -z "$not_in_topic"
338- then
339- echo >&2 "$topic is already up-to-date with master"
340- exit 1 ;# we could allow it, but there is no point.
341- else
342- exit 0
343- fi
344-else
345- not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
346- /usr/bin/perl -e '
347- my $topic = $ARGV[0];
348- my $msg = "* $topic has commits already merged to public branch:\n";
349- my (%not_in_next) = map {
350- /^([0-9a-f]+) /;
351- ($1 => 1);
352- } split(/\n/, $ARGV[1]);
353- for my $elem (map {
354- /^([0-9a-f]+) (.*)$/;
355- [$1 => $2];
356- } split(/\n/, $ARGV[2])) {
357- if (!exists $not_in_next{$elem->[0]}) {
358- if ($msg) {
359- print STDERR $msg;
360- undef $msg;
361- }
362- print STDERR " $elem->[1]\n";
363- }
364- }
365- ' "$topic" "$not_in_next" "$not_in_master"
366- exit 1
367-fi
368-
369-<<\DOC_END
370-
371-This sample hook safeguards topic branches that have been
372-published from being rewound.
373-
374-The workflow assumed here is:
375-
376- * Once a topic branch forks from "master", "master" is never
377- merged into it again (either directly or indirectly).
378-
379- * Once a topic branch is fully cooked and merged into "master",
380- it is deleted. If you need to build on top of it to correct
381- earlier mistakes, a new topic branch is created by forking at
382- the tip of the "master". This is not strictly necessary, but
383- it makes it easier to keep your history simple.
384-
385- * Whenever you need to test or publish your changes to topic
386- branches, merge them into "next" branch.
387-
388-The script, being an example, hardcodes the publish branch name
389-to be "next", but it is trivial to make it configurable via
390-$GIT_DIR/config mechanism.
391-
392-With this workflow, you would want to know:
393-
394-(1) ... if a topic branch has ever been merged to "next". Young
395- topic branches can have stupid mistakes you would rather
396- clean up before publishing, and things that have not been
397- merged into other branches can be easily rebased without
398- affecting other people. But once it is published, you would
399- not want to rewind it.
400-
401-(2) ... if a topic branch has been fully merged to "master".
402- Then you can delete it. More importantly, you should not
403- build on top of it -- other people may already want to
404- change things related to the topic as patches against your
405- "master", so if you need further changes, it is better to
406- fork the topic (perhaps with the same name) afresh from the
407- tip of "master".
408-
409-Let's look at this example:
410-
411- o---o---o---o---o---o---o---o---o---o "next"
412- / / / /
413- / a---a---b A / /
414- / / / /
415- / / c---c---c---c B /
416- / / / \ /
417- / / / b---b C \ /
418- / / / / \ /
419- ---o---o---o---o---o---o---o---o---o---o---o "master"
420-
421-
422-A, B and C are topic branches.
423-
424- * A has one fix since it was merged up to "next".
425-
426- * B has finished. It has been fully merged up to "master" and "next",
427- and is ready to be deleted.
428-
429- * C has not merged to "next" at all.
430-
431-We would want to allow C to be rebased, refuse A, and encourage
432-B to be deleted.
433-
434-To compute (1):
435-
436- git rev-list ^master ^topic next
437- git rev-list ^master next
438-
439- if these match, topic has not merged in next at all.
440-
441-To compute (2):
442-
443- git rev-list master..topic
444-
445- if this is empty, it is fully merged to "master".
446-
447-DOC_END
448diff -ruN rsd_org/.git/hooks/update.sample rsd_org_calsoft/.git/hooks/update.sample
449--- rsd_org/.git/hooks/update.sample 2017-12-19 13:19:16.488042958 +0530
450+++ rsd_org_calsoft/.git/hooks/update.sample 1970-01-01 05:30:00.000000000 +0530
451@@ -1,128 +0,0 @@
452-#!/bin/sh
453-#
454-# An example hook script to blocks unannotated tags from entering.
455-# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
456-#
457-# To enable this hook, rename this file to "update".
458-#
459-# Config
460-# ------
461-# hooks.allowunannotated
462-# This boolean sets whether unannotated tags will be allowed into the
463-# repository. By default they won't be.
464-# hooks.allowdeletetag
465-# This boolean sets whether deleting tags will be allowed in the
466-# repository. By default they won't be.
467-# hooks.allowmodifytag
468-# This boolean sets whether a tag may be modified after creation. By default
469-# it won't be.
470-# hooks.allowdeletebranch
471-# This boolean sets whether deleting branches will be allowed in the
472-# repository. By default they won't be.
473-# hooks.denycreatebranch
474-# This boolean sets whether remotely creating branches will be denied
475-# in the repository. By default this is allowed.
476-#
477-
478-# --- Command line
479-refname="$1"
480-oldrev="$2"
481-newrev="$3"
482-
483-# --- Safety check
484-if [ -z "$GIT_DIR" ]; then
485- echo "Don't run this script from the command line." >&2
486- echo " (if you want, you could supply GIT_DIR then run" >&2
487- echo " $0 <ref> <oldrev> <newrev>)" >&2
488- exit 1
489-fi
490-
491-if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
492- echo "usage: $0 <ref> <oldrev> <newrev>" >&2
493- exit 1
494-fi
495-
496-# --- Config
497-allowunannotated=$(git config --bool hooks.allowunannotated)
498-allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
499-denycreatebranch=$(git config --bool hooks.denycreatebranch)
500-allowdeletetag=$(git config --bool hooks.allowdeletetag)
501-allowmodifytag=$(git config --bool hooks.allowmodifytag)
502-
503-# check for no description
504-projectdesc=$(sed -e '1q' "$GIT_DIR/description")
505-case "$projectdesc" in
506-"Unnamed repository"* | "")
507- echo "*** Project description file hasn't been set" >&2
508- exit 1
509- ;;
510-esac
511-
512-# --- Check types
513-# if $newrev is 0000...0000, it's a commit to delete a ref.
514-zero="0000000000000000000000000000000000000000"
515-if [ "$newrev" = "$zero" ]; then
516- newrev_type=delete
517-else
518- newrev_type=$(git cat-file -t $newrev)
519-fi
520-
521-case "$refname","$newrev_type" in
522- refs/tags/*,commit)
523- # un-annotated tag
524- short_refname=${refname##refs/tags/}
525- if [ "$allowunannotated" != "true" ]; then
526- echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
527- echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
528- exit 1
529- fi
530- ;;
531- refs/tags/*,delete)
532- # delete tag
533- if [ "$allowdeletetag" != "true" ]; then
534- echo "*** Deleting a tag is not allowed in this repository" >&2
535- exit 1
536- fi
537- ;;
538- refs/tags/*,tag)
539- # annotated tag
540- if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
541- then
542- echo "*** Tag '$refname' already exists." >&2
543- echo "*** Modifying a tag is not allowed in this repository." >&2
544- exit 1
545- fi
546- ;;
547- refs/heads/*,commit)
548- # branch
549- if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
550- echo "*** Creating a branch is not allowed in this repository" >&2
551- exit 1
552- fi
553- ;;
554- refs/heads/*,delete)
555- # delete branch
556- if [ "$allowdeletebranch" != "true" ]; then
557- echo "*** Deleting a branch is not allowed in this repository" >&2
558- exit 1
559- fi
560- ;;
561- refs/remotes/*,commit)
562- # tracking branch
563- ;;
564- refs/remotes/*,delete)
565- # delete tracking branch
566- if [ "$allowdeletebranch" != "true" ]; then
567- echo "*** Deleting a tracking branch is not allowed in this repository" >&2
568- exit 1
569- fi
570- ;;
571- *)
572- # Anything else (is there anything else?)
573- echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
574- exit 1
575- ;;
576-esac
577-
578-# --- Finished
579-exit 0
580diff -ruN rsd_org/.git/info/exclude rsd_org_calsoft/.git/info/exclude
581--- rsd_org/.git/info/exclude 2017-12-19 13:19:16.488042958 +0530
582+++ rsd_org_calsoft/.git/info/exclude 1970-01-01 05:30:00.000000000 +0530
583@@ -1,6 +0,0 @@
584-# git ls-files --others --exclude-from=.git/info/exclude
585-# Lines that start with '#' are comments.
586-# For a project mostly in C, the following would be a good set of
587-# exclude patterns (uncomment them if you want to use them):
588-# *.[oa]
589-# *~
590diff -ruN rsd_org/.git/logs/HEAD rsd_org_calsoft/.git/logs/HEAD
591--- rsd_org/.git/logs/HEAD 2017-12-19 13:19:16.488042958 +0530
592+++ rsd_org_calsoft/.git/logs/HEAD 1970-01-01 05:30:00.000000000 +0530
593@@ -1 +0,0 @@
594-0000000000000000000000000000000000000000 80947e58159a4f1d864c544ca4ed2d15307208f2 nick_huang <nick_huang@accton.com> 1502862611 +0000 clone: from http://code.accton.com.tw/git/rsd.git
595diff -ruN rsd_org/.git/logs/refs/heads/RSA-SW-Accton-2.1.3 rsd_org_calsoft/.git/logs/refs/heads/RSA-SW-Accton-2.1.3
596--- rsd_org/.git/logs/refs/heads/RSA-SW-Accton-2.1.3 2017-12-19 13:19:16.488042958 +0530
597+++ rsd_org_calsoft/.git/logs/refs/heads/RSA-SW-Accton-2.1.3 1970-01-01 05:30:00.000000000 +0530
598@@ -1 +0,0 @@
599-0000000000000000000000000000000000000000 80947e58159a4f1d864c544ca4ed2d15307208f2 nick_huang <nick_huang@accton.com> 1502862611 +0000 clone: from http://code.accton.com.tw/git/rsd.git
600diff -ruN rsd_org/.git/logs/refs/remotes/origin/HEAD rsd_org_calsoft/.git/logs/refs/remotes/origin/HEAD
601--- rsd_org/.git/logs/refs/remotes/origin/HEAD 2017-12-19 13:19:16.488042958 +0530
602+++ rsd_org_calsoft/.git/logs/refs/remotes/origin/HEAD 1970-01-01 05:30:00.000000000 +0530
603@@ -1 +0,0 @@
604-0000000000000000000000000000000000000000 0f0f9cb796b4acb506c84d7aa40c4404b7ade7cd nick_huang <nick_huang@accton.com> 1502862611 +0000 clone: from http://code.accton.com.tw/git/rsd.git
605diff -ruN rsd_org/.git/packed-refs rsd_org_calsoft/.git/packed-refs
606--- rsd_org/.git/packed-refs 2017-12-19 13:19:16.488042958 +0530
607+++ rsd_org_calsoft/.git/packed-refs 1970-01-01 05:30:00.000000000 +0530
608@@ -1,4 +0,0 @@
609-# pack-refs with: peeled fully-peeled
610-f4eaaa9ebc96c08d2771f1a088e82a7b81762142 refs/remotes/origin/RSA-SW-Accton
611-80947e58159a4f1d864c544ca4ed2d15307208f2 refs/remotes/origin/RSA-SW-Accton-2.1.3
612-0f0f9cb796b4acb506c84d7aa40c4404b7ade7cd refs/remotes/origin/master
613diff -ruN rsd_org/.git/refs/heads/RSA-SW-Accton-2.1.3 rsd_org_calsoft/.git/refs/heads/RSA-SW-Accton-2.1.3
614--- rsd_org/.git/refs/heads/RSA-SW-Accton-2.1.3 2017-12-19 13:19:16.488042958 +0530
615+++ rsd_org_calsoft/.git/refs/heads/RSA-SW-Accton-2.1.3 1970-01-01 05:30:00.000000000 +0530
616@@ -1 +0,0 @@
617-80947e58159a4f1d864c544ca4ed2d15307208f2
618diff -ruN rsd_org/.git/refs/remotes/origin/HEAD rsd_org_calsoft/.git/refs/remotes/origin/HEAD
619--- rsd_org/.git/refs/remotes/origin/HEAD 2017-12-19 13:19:16.488042958 +0530
620+++ rsd_org_calsoft/.git/refs/remotes/origin/HEAD 1970-01-01 05:30:00.000000000 +0530
621@@ -1 +0,0 @@
622-ref: refs/remotes/origin/master
623diff -ruN rsd_org/PSME/agent/chassis/src/ipmb/watcher/thermal_sensor_task.cpp rsd_org_calsoft/PSME/agent/chassis/src/ipmb/watcher/thermal_sensor_task.cpp
624--- rsd_org/PSME/agent/chassis/src/ipmb/watcher/thermal_sensor_task.cpp 2017-12-19 13:19:16.488042958 +0530
625+++ rsd_org_calsoft/PSME/agent/chassis/src/ipmb/watcher/thermal_sensor_task.cpp 2017-12-15 17:52:20.975988851 +0530
626@@ -200,6 +200,11 @@
627 uint32_t i = 0;
628 char resultA[128];
629 int tmp1[8] = {0};
630+ /* ACL Added Begin */
631+ uint32_t j = 0, k = 0;
632+ int fan[8] = {0};
633+ int temp[8] = {0};
634+ /* ACL Added End */
635
636 /*Get FAN info.*/
637 for (const auto& key: manager_keys) {
638@@ -227,7 +232,16 @@
639 i = 0;
640 memset(resultA, 0x0, sizeof(resultA));
641 exec_shell("psme.sh get psu_power_out", resultA);
642- sscanf(resultA, " %d %d" , &tmp1[0] , &tmp1[1]);
643+ sscanf(resultA, " %d %d" , &tmp1[0] , &tmp1[1]);
644+ /* ACL Added Begin */
645+ memset(resultA, 0x0, sizeof(resultA));
646+ exec_shell("psme.sh get psu_temp_out", resultA);
647+ sscanf(resultA, " %d %d" , &temp[0] , &temp[1]);
648+ memset(resultA, 0x0, sizeof(resultA));
649+ exec_shell("psme.sh get psu_fan_out", resultA);
650+ sscanf(resultA, " %d %d" , &fan[0] , &fan[1]);
651+ /* ACL Added End */
652+
653
654 auto &psu_manager = agent_framework::module::ChassisComponents::get_instance()->get_psu_manager();
655
656@@ -240,6 +254,10 @@
657 if (psu_->get_psu_id() == i+1)
658 {
659 psu_->set_power_output(tmp1[i++]);
660+ /* ACL Added Begin */
661+ psu_->set_temp_output(temp[j++]);
662+ psu_->set_fan_output(fan[k++]);
663+ /* ACL Added Begin */
664 }
665 }
666
667diff -ruN rsd_org/PSME/agent/chassis/src/loader/chassis_loader.cpp rsd_org_calsoft/PSME/agent/chassis/src/loader/chassis_loader.cpp
668--- rsd_org/PSME/agent/chassis/src/loader/chassis_loader.cpp 2017-12-19 13:19:16.488042958 +0530
669+++ rsd_org_calsoft/PSME/agent/chassis/src/loader/chassis_loader.cpp 2017-12-15 17:52:26.894946981 +0530
670@@ -591,6 +591,17 @@
671 fru_info.set_model_number(json["model_number"].as_string());
672 fru_info.set_part_number(json["model_number"].as_string());
673 fru_info.set_serial_number(json["serial_number"].as_string());
674+ /* ACL Added Begin */
675+ fru_info.set_product_name(json["product_name"].as_string());
676+ fru_info.set_mac_address(json["mac_address"].as_string());
677+ fru_info.set_mac_range(json["mac_range"].as_string());
678+ fru_info.set_manufacture_date(json["manufacture_date"].as_string());
679+ fru_info.set_platform_name(json["platform_name"].as_string());
680+ fru_info.set_label_revision(json["label_revision"].as_string());
681+ fru_info.set_country_code(json["country_code"].as_string());
682+ fru_info.set_diag_version(json["diag_version"].as_string());
683+ fru_info.set_onie_version(json["onie_version"].as_string());
684+ /* ACL Added End */
685 system.set_fru_info(std::move(fru_info));
686 CommonComponents::get_instance()->get_system_manager().add_entry(system);
687 }
688diff -ruN rsd_org/PSME/agent/network/acc_sw/C_PINFO rsd_org_calsoft/PSME/agent/network/acc_sw/C_PINFO
689--- rsd_org/PSME/agent/network/acc_sw/C_PINFO 2017-12-19 13:19:16.488042958 +0530
690+++ rsd_org_calsoft/PSME/agent/network/acc_sw/C_PINFO 2017-12-15 17:52:40.989991292 +0530
691@@ -28,6 +28,17 @@
692 else
693 MANUFACTURER=`${ONLPDUMP} | grep -m 1 "Manufacturer" | awk -F':' '{print $2}'`
694 SERIAL_NUMBER=`${ONLPDUMP} | grep -m 1 "Serial Number" | awk -F':' '{print $2}'`
695+
696+ PRODUCT_NAME=`${ONLPDUMP} | grep -m 1 "Product Name" | awk '{print $3}'`
697+ MAC_ADDRESS=`${ONLPDUMP} | grep 'MAC:' | awk '{print $2}'`
698+ MAC_RANGE=`${ONLPDUMP} | grep -m 1 'MAC Range' | awk '{print $3}'`
699+ MANUFACTURE_DATE=`${ONLPDUMP} | grep 'Manufacture Date:' | awk '{print $3}'`
700+ PLATFORM_NAME=`${ONLPDUMP} | grep -m 1 'Platform Name:' | awk {'print $3'}`
701+ LABEL_REVISION=`${ONLPDUMP} | grep -m 1 'Label Revision:' | awk {'print $3'}`
702+ COUNTRY_CODE=`${ONLPDUMP} | grep -m 1 'Country Code:' | awk {'print $3'}`
703+ DIAG_VERSION=`${ONLPDUMP} | grep -m 1 'Diag Version:' | awk {'print $3'}`
704+ ONIE_VERSION=`${ONLPDUMP} | grep -m 1 'ONIE Version:' | awk {'print $3'}`
705+
706 ASSET_TAG_C=`cat "${ASSET_TAG}"`
707 PLATFORM="BDCR"
708 MODULE_NUMBER=`${ONLPDUMP} | grep -m 1 "Part Number" | awk -F':' '{print $2}'`
709@@ -56,7 +67,16 @@
710 \""asset_tag"\" : \""${ASSET_TAG_C}"\",
711 \""manufacturer"\" : \""${MANUFACTURER}"\",
712 \""model_number"\" : \""${MODULE_NUMBER}"\",
713- \""serial_number"\" : \""${SERIAL_NUMBER}"\"
714+ \""serial_number"\" : \""${SERIAL_NUMBER}"\",
715+ \""product_name"\" : \""${PRODUCT_NAME}"\",
716+ \""mac_address"\" : \""${MAC_ADDRESS}"\",
717+ \""mac_range"\" : \""${MAC_RANGE}"\",
718+ \""platform_name"\" : \""${PLATFORM_NAME}"\",
719+ \""manufacture_date"\" : \""${MANUFACTURE_DATE}"\",
720+ \""country_code"\" : \""${COUNTRY_CODE}"\",
721+ \""label_revision"\" : \""${LABEL_REVISION}"\",
722+ \""diag_version"\" : \""${DIAG_VERSION}"\",
723+ \""onie_version"\" : \""${ONIE_VERSION}"\"
724 }
725 ,
726 \"onlp\" :
727diff -ruN rsd_org/PSME/agent/network/acc_sw/HW_NODE_ASXVOLT16 rsd_org_calsoft/PSME/agent/network/acc_sw/HW_NODE_ASXVOLT16
728--- rsd_org/PSME/agent/network/acc_sw/HW_NODE_ASXVOLT16 2017-12-19 13:19:16.492042958 +0530
729+++ rsd_org_calsoft/PSME/agent/network/acc_sw/HW_NODE_ASXVOLT16 2017-12-15 17:52:47.145067428 +0530
730@@ -14,6 +14,8 @@
731 eval CURRENT_THERMAL_NODE5_PATH="/sys/bus/i2c/devices/10-004e/hwmon/hwmon5/device/temp1_input"
732 eval CURRENT_THERMAL_NODE6_PATH="/sys/bus/i2c/devices/18-005b/psu_temp1_input"
733 eval CURRENT_THERMAL_NODE7_PATH="/sys/bus/i2c/devices/17-0058/psu_temp1_input"
734+ eval CURRENT_PSU1_TEMP_NODE_PATH="/sys/bus/i2c/devices/18-005b/psu_temp1_input"
735+ eval CURRENT_PSU2_TEMP_NODE_PATH="/sys/bus/i2c/devices/17-0058/psu_temp1_input"
736
737 CURRENT_THERMAL_NUM="7"
738 CURRENT_PORT_NUM="20"
739diff -ruN rsd_org/PSME/agent/network/acc_sw/HW_NODE_VM rsd_org_calsoft/PSME/agent/network/acc_sw/HW_NODE_VM
740--- rsd_org/PSME/agent/network/acc_sw/HW_NODE_VM 2017-12-19 13:19:16.492042958 +0530
741+++ rsd_org_calsoft/PSME/agent/network/acc_sw/HW_NODE_VM 2017-12-15 17:52:55.509247611 +0530
742@@ -15,5 +15,7 @@
743 eval CURRENT_THERMAL_NODE5_PATH="/usr/local/bin/hwmon5/temp1_input"
744 eval CURRENT_THERMAL_NODE6_PATH="/usr/local/bin/hwmon6/temp1_input"
745 eval CURRENT_THERMAL_NODE7_PATH="/usr/local/bin/hwmon7/temp1_input"
746+ eval CURRENT_PSU1_TEMP_NODE_PATH="/usr/local/bin/hwmon6/temp1_input"
747+ eval CURRENT_PSU2_TEMP_NODE_PATH="/usr/local/bin/hwmon7/temp1_input"
748
749 CURRENT_THERMAL_NUM="7"
750diff -ruN rsd_org/PSME/agent/network/acc_sw/psme.sh rsd_org_calsoft/PSME/agent/network/acc_sw/psme.sh
751--- rsd_org/PSME/agent/network/acc_sw/psme.sh 2017-12-19 13:19:16.492042958 +0530
752+++ rsd_org_calsoft/PSME/agent/network/acc_sw/psme.sh 2017-12-19 13:08:45.948051405 +0530
753@@ -8,10 +8,14 @@
754 echo "psme.sh get fan_rear_speed_rpm : get current fan rear speed "
755 echo "psme.sh get thermal_sensor : get current thermal sensor "
756 echo "psme.sh get thermal_sensor_num : get current thermal sensor number "
757- echo "psme.sh get psu_power_out : get currnet psu power out "
758+ echo "psme.sh get psu_power_out : get current psu power out "
759+ echo "psme.sh get psu_fan_out : get current psu fan out "
760+ echo "psme.sh get psu_temp_out : get current psu temp out "
761 echo "psme.sh get max_port_num : get current max port num "
762 echo "psme.sh get sfp_presence : get currnet sfp presence status "
763 echo "psme.sh get sfp_port_status PORT : get current PORT status "
764+ echo "psme.sh get sfp_bias_current PORT : get current bias PORT "
765+ echo "psme.sh get sfp_path PORT : get sfp port path "
766 echo "psme.sh set force_off : set device force off "
767 echo "psme.sh set shutdown : set device shutdown gracefully "
768 echo "psme.sh set force_restart : set device force restart "
769@@ -146,6 +150,48 @@
770 echo "${pout1} ${pout2}"
771 }
772
773+#ACL Added for PSU fan and temp
774+get_psu_temp_out()
775+{
776+ if [ -f "${CURRENT_PSU1_TEMP_NODE_PATH}" ];then
777+ local tout1=`cat ${CURRENT_PSU1_TEMP_NODE_PATH}`
778+ if [ "${tout1}" = "" ];then
779+ tout1="0"
780+ fi
781+ else
782+ local tout1=-1
783+ fi
784+
785+ if [ -f "${CURRENT_PSU2_TEMP_NODE_PATH}" ];then
786+ local tout2=`cat ${CURRENT_PSU2_TEMP_NODE_PATH}`
787+ if [ "${tout2}" = "" ];then
788+ tout2="0"
789+ fi
790+ else
791+ local tout2=-1
792+ fi
793+ echo "${tout1} ${tout2}"
794+}
795+
796+get_psu_fan_out()
797+{
798+ local status1=`cat ${CURRENT_PSU1_FAN_NODE_PATH}/psu_fan1_speed_rpm`
799+ if [ "$status1" = "" ] || [ "$status1" = "0" ] ; then
800+ f_status="${f_status} -1 "
801+ else
802+ f_status="${f_status} ${status1} "
803+ fi
804+
805+ local status2=`cat ${CURRENT_PSU2_FAN_NODE_PATH}/psu_fan1_speed_rpm`
806+ if [ "$status2" = "" ] || [ "$status2" = "0" ] ; then
807+ f_status="${f_status} -1 "
808+ else
809+ f_status="${f_status} ${status2} "
810+ fi
811+
812+ echo "${f_status}"
813+}
814+
815 get_max_fan_num()
816 {
817 #if there doesn't have the 'fan1_present' file , it will receive double fan number.
818@@ -435,6 +481,108 @@
819 echo "$fault_value"
820 }
821
822+get_sfp_path ()
823+{
824+ echo "$(get_sfp_port_path "${1}")"
825+}
826+
827+check_bias_current()
828+{
829+ #check_bias_current bias_ct bias_ha bias_la bias_hw bias_lw
830+ bias_ct=$1
831+ bias_ha=$2
832+ bias_la=$3
833+ bias_hw=$4
834+ bias_lw=$5
835+ res=0
836+
837+ if [ $((16#${bias_ct})) -ge $((16#${bias_ha})) ] || [ $((16#${bias_ct})) -le $((16#${bias_la})) ]; then
838+ res=$((1 << 0 | 1 << 1))
839+ echo $res
840+ elif [[ $((16#$bias_ct)) -ge $((16#$bias_hw)) ]] && [[ $((16#$bias_ct)) -lt $((16#$bias_ha)) ]]; then
841+ res=$(($res | 1 << 0))
842+ echo $res
843+ elif [[ $((16#$bias_ct)) -le $((16#$bias_lw)) ]] && [[ $((16#$bias_ct)) -gt $((16#$bias_la)) ]]; then
844+ res=$(($res | 1 << 0))
845+ echo $res
846+ else
847+ res=0
848+ echo $res
849+ fi
850+}
851+
852+get_bias_current()
853+{
854+ status=1
855+
856+ if [ "$status" = "1" ]; then
857+
858+ port=$(printf %02d $1)
859+ if [ $port -ge 1 ] && [ $port -le 16 ];then
860+ #XFP port
861+ sfp_path=$(get_sfp_port_path "${port}")
862+ sfp_is_present=`cat $sfp_path/sfp_is_present`
863+ if [ "$sfp_is_present" == "1" ]; then
864+ sfp_eeprom="hd $sfp_path/sfp_eeprom"
865+ bias_ct=`$sfp_eeprom | grep "0060 " | awk -F' ' '{print $6 $7}'`
866+ if [[ ! -z ${bias_ct} ]]; then
867+ bias_ha=`$sfp_eeprom | grep "0010 " | awk -F' ' '{print $4 $5}'`
868+ bias_la=`$sfp_eeprom | grep "0010 " | awk -F' ' '{print $6 $7}'`
869+ bias_hw=`$sfp_eeprom | grep "0010 " | awk -F' ' '{print $8 $9}'`
870+ bias_lw=`$sfp_eeprom | grep "0010 " | awk -F' ' '{print $10 $11}'`
871+ res=$(check_bias_current $bias_ct $bias_ha $bias_la $bias_hw $bias_lw)
872+ if [ $res -eq 0 ]; then
873+ echo "OKAY [$bias_ct]"
874+ elif [ $res -eq 1 ]; then
875+ echo "WARN [$bias_ct]"
876+ elif [ $res -eq 3 ]; then
877+ echo "CRIT [$bias_ct]"
878+ fi
879+ fi
880+ else
881+ bias_ct=-1
882+ echo "$bias_ct"
883+ fi
884+ elif [ $port -ge 17 ] && [ $port -le 20 ];then
885+ qsfp_path=$(get_sfp_port_path "${port}")
886+ qsfp_is_present=`cat $qsfp_path/sfp_is_present`
887+ if [ "$qsfp_is_present" == "1" ]; then
888+ qsfp_eeprom="hd $qsfp_path/sfp_eeprom"
889+ #QSFP port
890+ bias_c1=`$qsfp_eeprom | grep "0020 " | awk -F' ' '{print $12 $13}' `
891+ bias_c2=`$qsfp_eeprom | grep "0020 " | awk -F' ' '{print $14 $15}' `
892+ bias_c3=`$qsfp_eeprom | grep "0020 " | awk -F' ' '{print $16 $17}' `
893+ bias_c4=`$qsfp_eeprom | grep "0030 " | awk -F' ' '{print $2 $3}' `
894+ if [[ ! -z ${bias_c1} ]] && [[ ! -z ${bias_c2} ]] && [[ ! -z ${bias_c3} ]] && [[ ! -z ${bias_c4} ]] ; then
895+ #get threshold values from qsfp_eeprom path with $port
896+ bias_ha=`$qsfp_eeprom | grep "00230 " | awk -F' ' '{print $10 $11}'`
897+ bias_la=`$qsfp_eeprom | grep "00230 " | awk -F' ' '{print $12 $13}'`
898+ bias_hw=`$qsfp_eeprom | grep "00230 " | awk -F' ' '{print $14 $15}'`
899+ bias_lw=`$qsfp_eeprom | grep "00230 " | awk -F' ' '{print $16 $17}'`
900+ res_c1=$(check_bias_current $bias_c1 $bias_ha $bias_la $bias_hw $bias_lw)
901+ res_c2=$(check_bias_current $bias_c2 $bias_ha $bias_la $bias_hw $bias_lw)
902+ res_c3=$(check_bias_current $bias_c3 $bias_ha $bias_la $bias_hw $bias_lw)
903+ res_c4=$(check_bias_current $bias_c4 $bias_ha $bias_la $bias_hw $bias_lw)
904+ if [ $res_c1 -eq 0 ] && [ $res_c2 -eq 0 ] && [ $res_c3 -eq 0 ] && [ $res_c4 -eq 0 ] ; then
905+ echo "OKAY [$bias_c1, $bias_c2, $bias_c3, $bias_c4]"
906+ elif [ $res_c1 -eq 1 ] || [ $res_c2 -eq 1 ] || [ $res_c3 -eq 1 ] ||[ $res_c4 -eq 1 ] ; then
907+ echo "WARN [$bias_c1, $bias_c2, $bias_c3, $bias_c4]"
908+ elif [ $res_c1 -eq 3 ] || [ $res_c2 -eq 3 ] || [ $res_c3 -eq 3 ] ||[ $res_c4 -eq 3 ] ; then
909+ echo "CRIT [$bias_c1, $bias_c2, $bias_c3, $bias_c4]"
910+ fi
911+ fi
912+ else
913+ bias_ct=-1
914+ echo "$bias_ct"
915+ fi
916+ else
917+ echo "wrong port number"
918+ fi
919+ else
920+ echo "Port disabled"
921+ fi
922+}
923+
924 get_max_port_num()
925 {
926 echo "${CURRENT_PORT_NUM}"
927@@ -554,6 +702,12 @@
928 "psu_power_out")
929 get_psu_power_out
930 ;;
931+ "psu_fan_out")
932+ get_psu_fan_out
933+ ;;
934+ "psu_temp_out")
935+ get_psu_temp_out
936+ ;;
937 "max_fan_num")
938 get_max_fan_num
939 ;;
940@@ -563,6 +717,12 @@
941 "sfp_port_status")
942 get_sfp_port_status "${3}"
943 ;;
944+ "sfp_bias_current")
945+ get_bias_current "${3}"
946+ ;;
947+ "sfp_path")
948+ get_sfp_path "${3}"
949+ ;;
950 "sfp_presence")
951 get_sfp_presence
952 ;;
953diff -ruN rsd_org/PSME/application/include/psme/rest/constants/chassis.hpp rsd_org_calsoft/PSME/application/include/psme/rest/constants/chassis.hpp
954--- rsd_org/PSME/application/include/psme/rest/constants/chassis.hpp 2017-12-19 13:19:16.492042958 +0530
955+++ rsd_org_calsoft/PSME/application/include/psme/rest/constants/chassis.hpp 2017-12-15 17:55:54.238571548 +0530
956@@ -74,6 +74,10 @@
957 extern const char POWER_AVAILABLE[];
958 extern const char POWER_CAPACITY[];
959 extern const char POWER_CONSUMED[];
960+/* ACL Added Begin */
961+extern const char FAN_OUTPUT[];
962+extern const char TEMP_OUTPUT[];
963+/* ACL Added End */
964 extern const char POWER_SUPPLIES[];
965 extern const char LAST_POWER_OUTPUT[];
966 /*Nick Added Begin: */
967diff -ruN rsd_org/PSME/application/include/psme/rest/constants/constants.hpp rsd_org_calsoft/PSME/application/include/psme/rest/constants/constants.hpp
968--- rsd_org/PSME/application/include/psme/rest/constants/constants.hpp 2017-12-19 13:19:16.492042958 +0530
969+++ rsd_org_calsoft/PSME/application/include/psme/rest/constants/constants.hpp 2017-12-15 17:56:03.283091747 +0530
970@@ -118,6 +118,17 @@
971 extern const char MODEL[];
972 extern const char SERIAL[];
973 extern const char PART_NUMBER[];
974+/* ACL Added Begin */
975+extern const char PRODUCT_NAME[];
976+extern const char MAC_ADDRESS[];
977+extern const char MAC_RANGE[];
978+extern const char MANUFACTURE_DATE[];
979+extern const char PLATFORM_NAME[];
980+extern const char COUNTRY_CODE[];
981+extern const char LABEL_REVISION[];
982+extern const char DIAG_VERSION[];
983+extern const char ONIE_VERSION[];
984+/* ACL Added End */
985 extern const char ASSET_TAG[];
986 extern const char STATUS[];
987 extern const char STATE[];
988@@ -139,7 +150,6 @@
989 extern const char HASH[];
990 extern const char CHASSIS[];
991 extern const char RESET_TYPE[];
992-extern const char MAC_ADDRESS[];
993 }
994
995 namespace ErrorMessage {
996diff -ruN rsd_org/PSME/application/include/psme/rest/constants/ethernet.hpp rsd_org_calsoft/PSME/application/include/psme/rest/constants/ethernet.hpp
997--- rsd_org/PSME/application/include/psme/rest/constants/ethernet.hpp 2017-12-15 06:54:00.000000000 +0530
998+++ rsd_org_calsoft/PSME/application/include/psme/rest/constants/ethernet.hpp 2017-12-19 13:09:05.036051150 +0530
999@@ -43,6 +43,7 @@
1000 namespace EthernetSwitchPort {
1001 extern const char PORT[];
1002 extern const char PORT_ID[];
1003+extern const char BIAS_CURRENT[];
1004 extern const char LINK_TYPE[];
1005 extern const char OPERATIONAL_STATE[];
1006 extern const char ADMINISTRATIVE_STATE[];
1007diff -ruN rsd_org/PSME/application/include/psme/rest/constants/system.hpp rsd_org_calsoft/PSME/application/include/psme/rest/constants/system.hpp
1008--- rsd_org/PSME/application/include/psme/rest/constants/system.hpp 2017-12-15 06:54:00.000000000 +0530
1009+++ rsd_org_calsoft/PSME/application/include/psme/rest/constants/system.hpp 2017-12-15 17:56:09.021959873 +0530
1010@@ -59,6 +59,17 @@
1011 extern const char TARGET_PORTAL_IP[];
1012 extern const char TARGET_PORTAL_PORT[];
1013 extern const char BIOS_VERSION[];
1014+/* ACL Added Begin */
1015+extern const char PRODUCT_NAME[];
1016+extern const char PLATFORM_NAME[];
1017+extern const char COUNTRY_CODE[];
1018+extern const char MAC_RANGE[];
1019+extern const char MAC_ADDRESS[];
1020+extern const char LABEL_REVISION[];
1021+extern const char MANUFACTURE_DATE[];
1022+extern const char DIAG_VERSION[];
1023+extern const char ONIE_VERSION[];
1024+/* ACL Added End */
1025 extern const char PROCESSOR_SUMMARY[];
1026 extern const char COUNT[];
1027 extern const char MEMORY_SUMMARY[];
1028diff -ruN rsd_org/PSME/application/src/rest/constants/chassis.cpp rsd_org_calsoft/PSME/application/src/rest/constants/chassis.cpp
1029--- rsd_org/PSME/application/src/rest/constants/chassis.cpp 2017-12-19 13:19:16.492042958 +0530
1030+++ rsd_org_calsoft/PSME/application/src/rest/constants/chassis.cpp 2017-12-15 17:56:19.139016095 +0530
1031@@ -66,6 +66,10 @@
1032 const char POWER_AVAILABLE[] = "PowerAvailableWatts";
1033 const char POWER_CAPACITY[] = "PowerCapacity";
1034 const char POWER_CONSUMED[] = "PowerConsumedWatts";
1035+/* ACL Added Begin */
1036+const char TEMP_OUTPUT[] = "PsuTemperature";
1037+const char FAN_OUTPUT[] = "PsuFanRpm";
1038+/* ACL Added End */
1039 const char POWER_SUPPLIES[] = "PowerSupplies";
1040 const char LAST_POWER_OUTPUT[] = "LastPowerOutputWatts";
1041 }
1042diff -ruN rsd_org/PSME/application/src/rest/constants/constants.cpp rsd_org_calsoft/PSME/application/src/rest/constants/constants.cpp
1043--- rsd_org/PSME/application/src/rest/constants/constants.cpp 2017-12-19 13:19:16.492042958 +0530
1044+++ rsd_org_calsoft/PSME/application/src/rest/constants/constants.cpp 2017-12-15 17:56:23.237064187 +0530
1045@@ -100,6 +100,16 @@
1046 const char MODEL[] = "Model";
1047 const char SERIAL[] = "SerialNumber";
1048 const char PART_NUMBER[] = "PartNumber";
1049+/* ACL Added Begin */
1050+const char PRODUCT_NAME[] = "ProductName";
1051+const char MAC_RANGE[] = "MACRange";
1052+const char MANUFACTURE_DATE[] = "ManufactureDate";
1053+const char COUNTRY_CODE[] = "CountryCode";
1054+const char LABEL_REVISION[] = "LabelRevision";
1055+const char PLATFORM_NAME[] = "PlatformName";
1056+const char DIAG_VERSION[] = "DiagVersion";
1057+const char ONIE_VERSION[] = "OnieVersion";
1058+/* ACL Added End */
1059 const char ASSET_TAG[] = "AssetTag";
1060 const char STATUS[] = "Status";
1061 const char STATE[] = "State";
1062diff -ruN rsd_org/PSME/application/src/rest/constants/ethernet.cpp rsd_org_calsoft/PSME/application/src/rest/constants/ethernet.cpp
1063--- rsd_org/PSME/application/src/rest/constants/ethernet.cpp 2017-12-19 13:19:16.492042958 +0530
1064+++ rsd_org_calsoft/PSME/application/src/rest/constants/ethernet.cpp 2017-12-19 13:09:40.252050678 +0530
1065@@ -38,6 +38,7 @@
1066 namespace EthernetSwitchPort {
1067 const char PORT[] = "Port";
1068 const char PORT_ID[] = "PortId";
1069+const char BIAS_CURRENT[] = "BiasCurrent";
1070 const char LINK_TYPE[] = "LinkType";
1071 const char OPERATIONAL_STATE[] = "OperationalState";
1072 const char ADMINISTRATIVE_STATE[] = "AdministrativeState";
1073diff -ruN rsd_org/PSME/application/src/rest/constants/system.cpp rsd_org_calsoft/PSME/application/src/rest/constants/system.cpp
1074--- rsd_org/PSME/application/src/rest/constants/system.cpp 2017-12-15 06:54:00.000000000 +0530
1075+++ rsd_org_calsoft/PSME/application/src/rest/constants/system.cpp 2017-12-15 17:56:28.175532295 +0530
1076@@ -59,6 +59,17 @@
1077 const char TARGET_PORTAL_IP[] = "TargetPortalIP";
1078 const char TARGET_PORTAL_PORT[] = "TargetPortalPort";
1079 const char BIOS_VERSION[] = "BiosVersion";
1080+/* ACL Added Begin */
1081+const char PRODUCT_NAME[] = "ProductName";
1082+const char MAC_ADDRESS[] = "MACAddress";
1083+const char MAC_RANGE[] = "MACRange";
1084+const char MANUFACTURE_DATE[] = "ManufactureDate";
1085+const char PLATFORM_NAME[] = "PlatformName";
1086+const char LABEL_REVISION[] = "LabelRevision";
1087+const char COUNTRY_CODE[] = "CountryCode";
1088+const char DIAG_VERSION[] = "DiagVersion";
1089+const char ONIE_VERSION[] = "OnieVersion";
1090+/* ACL Added End */
1091 const char PROCESSOR_SUMMARY[] = "ProcessorSummary";
1092 const char COUNT[] = "Count";
1093 const char MEMORY_SUMMARY[] = "MemorySummary";
1094diff -ruN rsd_org/PSME/application/src/rest/endpoints/chassis/thermal_zone.cpp rsd_org_calsoft/PSME/application/src/rest/endpoints/chassis/thermal_zone.cpp
1095--- rsd_org/PSME/application/src/rest/endpoints/chassis/thermal_zone.cpp 2017-12-19 13:19:16.492042958 +0530
1096+++ rsd_org_calsoft/PSME/application/src/rest/endpoints/chassis/thermal_zone.cpp 2017-12-15 17:56:45.712296681 +0530
1097@@ -65,7 +65,7 @@
1098
1099 if(tz_.get_temperature() == -1)
1100 {
1101- json["Temperature"]["Status"]["health"] = json::Value::Type::NIL;
1102+ json["Temperature"]["Status"]["Health"] = json::Value::Type::NIL;
1103 json["Temperature"]["Status"]["State"] = "Disabled";
1104
1105 json["Temperature"]["ReadingCelsius"] = "0";
1106@@ -74,22 +74,22 @@
1107 {
1108 if((tz_.get_temperature() < 0) || ((tz_.get_temperature() < 55000) && (tz_.get_temperature() >= 45000)))
1109 {
1110- json["Temperature"]["Status"]["health"] = "Warning";
1111+ json["Temperature"]["Status"]["Health"] = "Warning";
1112 json["Temperature"]["Status"]["State"] = "Enabled";
1113 }
1114 else if((tz_.get_temperature() < 60000) && ((tz_.get_temperature() >= 55000)))
1115 {
1116- json["Temperature"]["Status"]["health"] = "Warning";
1117+ json["Temperature"]["Status"]["Health"] = "Warning";
1118 json["Temperature"]["Status"]["State"] = "Enabled";
1119 }
1120 else if((tz_.get_temperature() >= 60000))
1121 {
1122- json["Temperature"]["Status"]["health"] = "Critical";
1123+ json["Temperature"]["Status"]["Health"] = "Critical";
1124 json["Temperature"]["Status"]["State"] = "Enabled";
1125 }
1126 else
1127 {
1128- json["Temperature"]["Status"]["health"] = "OK";
1129+ json["Temperature"]["Status"]["Health"] = "OK";
1130 json["Temperature"]["Status"]["State"] = "Enabled";
1131 }
1132 }
1133@@ -175,6 +175,10 @@
1134 json::Value rs;
1135 rs[Common::ODATA_TYPE] = "Power.v1_0_0.PowerSupply";
1136 rs[PowerZone::POWER_CONSUMED] = json::Value::Type::NIL;
1137+/* ACL Added Begin */
1138+ rs[PowerZone::TEMP_OUTPUT] = json::Value::Type::NIL;
1139+ rs[PowerZone::FAN_OUTPUT] = json::Value::Type::NIL;
1140+/* ACL Added End */
1141
1142 r["PowerSupply"] = std::move(rs);
1143
1144@@ -207,6 +211,38 @@
1145 if (psu_.get_psu_id() == req_psu_id) {
1146 json["PowerSupply"][Common::MEMBER_ID] = req_psu_id ;
1147 json["PowerSupply"][PowerZone::POWER_CONSUMED] = (psu_.get_power_output() * 0.001);
1148+ /* ACL Added Begin */
1149+ json["PowerSupply"][PowerZone::TEMP_OUTPUT] = (psu_.get_temp_output() * 0.001);
1150+ json["PowerSupply"][PowerZone::FAN_OUTPUT] = (psu_.get_fan_output() * 0.001);
1151+ if (psu_.get_fan_output() < 0)
1152+ {
1153+ json["PowerSupply"]["Status"]["State"] = "Disabled";
1154+ json["PowerSupply"]["Status"]["Health"] = json::Value::Type::NIL;
1155+ }
1156+ else
1157+ {
1158+ if((psu_.get_temp_output() < 0) || ((psu_.get_temp_output() < 55000) && (psu_.get_temp_output() >= 45000)))
1159+ {
1160+ json["PowerSupply"]["Status"]["Health"] = "Warning";
1161+ json["PowerSupply"]["Status"]["State"] = "Enabled";
1162+ }
1163+ else if((psu_.get_temp_output() < 60000) && ((psu_.get_temp_output() >= 55000)))
1164+ {
1165+ json["PowerSupply"]["Status"]["Health"] = "Warning";
1166+ json["PowerSupply"]["Status"]["State"] = "Enabled";
1167+ }
1168+ else if((psu_.get_temp_output() >= 60000))
1169+ {
1170+ json["PowerSupply"]["Status"]["Health"] = "Critical";
1171+ json["PowerSupply"]["Status"]["State"] = "Enabled";
1172+ }
1173+ else
1174+ {
1175+ json["PowerSupply"]["Status"]["Health"] = "OK";
1176+ json["PowerSupply"]["Status"]["State"] = "Enabled";
1177+ }
1178+ }
1179+ /* ACL Added End */
1180 }
1181 }
1182
1183diff -ruN rsd_org/PSME/application/src/rest/endpoints/ethernet/ethernet_switch_port.cpp rsd_org_calsoft/PSME/application/src/rest/endpoints/ethernet/ethernet_switch_port.cpp
1184--- rsd_org/PSME/application/src/rest/endpoints/ethernet/ethernet_switch_port.cpp 2017-12-19 13:19:16.496042958 +0530
1185+++ rsd_org_calsoft/PSME/application/src/rest/endpoints/ethernet/ethernet_switch_port.cpp 2017-12-19 13:11:09.044049488 +0530
1186@@ -58,6 +58,7 @@
1187 r[Common::NAME] = "Ethernet Switch Port";
1188 r[Common::DESCRIPTION] = "Ethernet Switch Port description";
1189 r[constants::EthernetSwitchPort::PORT_ID] = json::Value::Type::NIL;
1190+ r[constants::EthernetSwitchPort::BIAS_CURRENT] = json::Value::Type::NIL;
1191 r[Common::STATUS][Common::STATE] = json::Value::Type::NIL;
1192 r[Common::STATUS][Common::HEALTH] = json::Value::Type::NIL;
1193 r[Common::STATUS][Common::HEALTH_ROLLUP] = json::Value::Type::NIL;
1194@@ -401,18 +402,43 @@
1195 if( std::stoi(req.params[PathParam::ETHERNET_SWITCH_ID])==1)//mgmt port
1196 sprintf(command, "cat /sys/class/net/%s/operstate", "ma1");
1197 else
1198- sprintf(command, "psme.sh get sfp_port_status %d" , std::stoi(req.params[PathParam::SWITCH_PORT_ID]));
1199+ {
1200+ //sprintf(command, "psme.sh get sfp_port_status %d" , std::stoi(req.params[PathParam::SWITCH_PORT_ID]));
1201+ /* ACL Added Begin */
1202+ sprintf(command, "psme.sh get sfp_bias_current %d" , std::stoi(req.params[PathParam::SWITCH_PORT_ID]));
1203+ log_debug(GET_LOGGER("ethernet"), "Ethernet switch command" << command);
1204+ /* ACL Added End */
1205+ }
1206
1207 memset(resultA,0x0, sizeof(resultA));
1208
1209 exec_shell(command, resultA);
1210+/* ACL Added Begin */
1211+ if( std::stoi(req.params[PathParam::ETHERNET_SWITCH_ID]) !=1)//mgmt port
1212+ {
1213+ resultA[strlen(resultA) -1] = '\0';
1214+ r[constants::EthernetSwitchPort::BIAS_CURRENT] = resultA+5;
1215+ }
1216+
1217
1218- if(!strncmp(resultA, "1", 1) || !strncmp("up", resultA, 2))
1219+ if(!strncmp(resultA, "OKAY", 4) || !strncmp("up", resultA, 2))
1220 {
1221 r[Common::STATUS][Common::STATE] = "Enabled";
1222 r[Common::STATUS][Common::HEALTH] = "OK";
1223 r[Common::STATUS][Common::HEALTH_ROLLUP] = "OK";
1224 }
1225+ else if(!strncmp(resultA, "WARN", 4))
1226+ {
1227+ r[Common::STATUS][Common::STATE] = "Enabled";
1228+ r[Common::STATUS][Common::HEALTH] = "Warning";
1229+ r[Common::STATUS][Common::HEALTH_ROLLUP] = "N/A";
1230+ }
1231+ else if(!strncmp(resultA, "CRIT", 4))
1232+ {
1233+ r[Common::STATUS][Common::STATE] = "Enabled";
1234+ r[Common::STATUS][Common::HEALTH] = "Critical";
1235+ r[Common::STATUS][Common::HEALTH_ROLLUP] = "N/A";
1236+ }
1237 else
1238 {
1239 r[Common::STATUS][Common::STATE] = "Disabled";
1240@@ -420,6 +446,7 @@
1241 r[Common::STATUS][Common::HEALTH_ROLLUP] = "N/A";
1242 }
1243 }
1244+/* ACL Added End */
1245 /* Nick disable //
1246 r[Common::STATUS][Common::HEALTH_ROLLUP] =
1247 endpoint::HealthRollup<agent_framework::model::EthernetSwitchPort>().get(port.get_uuid());
1248diff -ruN rsd_org/PSME/application/src/rest/endpoints/system/system.cpp rsd_org_calsoft/PSME/application/src/rest/endpoints/system/system.cpp
1249--- rsd_org/PSME/application/src/rest/endpoints/system/system.cpp 2017-12-19 13:19:16.496042958 +0530
1250+++ rsd_org_calsoft/PSME/application/src/rest/endpoints/system/system.cpp 2017-12-15 17:57:14.950909325 +0530
1251@@ -68,6 +68,17 @@
1252 response[System::INDICATOR_LED] = json::Value::Type::NIL;
1253 response[System::POWER_STATE] = json::Value::Type::NIL;
1254 response[System::BIOS_VERSION] = json::Value::Type::NIL;
1255+ /* ACL Added Begin */
1256+ response[System::PRODUCT_NAME] = json::Value::Type::NIL;
1257+ response[System::MAC_ADDRESS] = json::Value::Type::NIL;
1258+ response[System::MAC_RANGE] = json::Value::Type::NIL;
1259+ response[System::MANUFACTURE_DATE] = json::Value::Type::NIL;
1260+ response[System::PLATFORM_NAME] = json::Value::Type::NIL;
1261+ response[System::LABEL_REVISION] = json::Value::Type::NIL;
1262+ response[System::COUNTRY_CODE] = json::Value::Type::NIL;
1263+ response[System::DIAG_VERSION] = json::Value::Type::NIL;
1264+ response[System::ONIE_VERSION] = json::Value::Type::NIL;
1265+ /* ACL Added End */
1266
1267 json::Value boot;
1268 boot[Common::ODATA_TYPE] = "#ComputerSystem.v1_1_0.Boot";
1269@@ -324,7 +335,6 @@
1270
1271 endpoint::System::~System() {}
1272
1273-
1274 void endpoint::System::get(const server::Request& req, server::Response& res) {
1275 auto response = make_prototype();
1276 response[Common::ODATA_ID] = PathBuilder(req).build();
1277@@ -339,6 +349,17 @@
1278 response[Common::MODEL] = system.get_fru_info().get_model_number();
1279 response[Common::SERIAL] = system.get_fru_info().get_serial_number();
1280 response[Common::PART_NUMBER] = system.get_fru_info().get_part_number();
1281+ /* ACL Added Begin */
1282+ response[Common::PRODUCT_NAME] = system.get_fru_info().get_product_name();
1283+ response[Common::MAC_ADDRESS] = system.get_fru_info().get_mac_address();
1284+ response[Common::MAC_RANGE] = system.get_fru_info().get_mac_range();
1285+ response[Common::MANUFACTURE_DATE] = system.get_fru_info().get_manufacture_date();
1286+ response[Common::PLATFORM_NAME] = system.get_fru_info().get_platform_name();
1287+ response[Common::COUNTRY_CODE] = system.get_fru_info().get_country_code();
1288+ response[Common::LABEL_REVISION] = system.get_fru_info().get_label_revision();
1289+ response[Common::DIAG_VERSION] = system.get_fru_info().get_diag_version();
1290+ response[Common::ONIE_VERSION] = system.get_fru_info().get_onie_version();
1291+ /* ACL Added End */
1292 response[constants::Common::UUID] = ServiceUuid::get_instance()->get_service_uuid();
1293 endpoint::status_to_json(system, response);
1294 response[Common::STATUS][Common::HEALTH_ROLLUP] =
1295@@ -359,10 +380,7 @@
1296 }
1297
1298
1299-
1300-
1301 }
1302-
1303 response[constants::System::SKU] = system.get_sku();
1304 response[constants::Common::ASSET_TAG] = system.get_asset_tag();
1305 response[constants::System::INDICATOR_LED] = system.get_indicator_led();
1306diff -ruN rsd_org/PSME/common/agent-framework/include/agent-framework/module/constants/chassis.hpp rsd_org_calsoft/PSME/common/agent-framework/include/agent-framework/module/constants/chassis.hpp
1307--- rsd_org/PSME/common/agent-framework/include/agent-framework/module/constants/chassis.hpp 2017-12-19 13:19:16.496042958 +0530
1308+++ rsd_org_calsoft/PSME/common/agent-framework/include/agent-framework/module/constants/chassis.hpp 2017-12-15 17:57:26.028445568 +0530
1309@@ -107,6 +107,10 @@
1310 static constexpr const char SLOT[] = "slot";
1311 static constexpr const char POWER_INPUT[] = "powerInput";
1312 static constexpr const char POWER_OUTPUT[] = "powerOutput";
1313+ /* ACL Added Begin */
1314+ static constexpr const char TEMP_OUTPUT[] = "tempOutput";
1315+ static constexpr const char FAN_OUTPUT[] = "fanOutput";
1316+ /* ACL Added End */
1317 static constexpr const char POWER_CAPACITY[] = "powerCapacity";
1318 static constexpr const char FRU_INFO[] = "fruInfo";
1319 static constexpr const char OEM[] = "oem";
1320@@ -125,6 +129,10 @@
1321 static constexpr const char ZONE[] = "zone";
1322 static constexpr const char STATUS[] = "status";
1323 static constexpr const char POWER_INPUT[] = "powerInput";
1324+/* ACL Added Begin */
1325+ static constexpr const char FAN_OUTPUT[] = "fanOutput";
1326+ static constexpr const char TEMP_OUTPUT[] = "tempOutput";
1327+/* ACL Added End */
1328 static constexpr const char POWER_OUTPUT[] = "powerOutput";
1329 static constexpr const char POWER_CAPACITY[] = "powerCapacity";
1330 static constexpr const char COLLECTIONS[] = "collections";
1331diff -ruN rsd_org/PSME/common/agent-framework/include/agent-framework/module/constants/common.hpp rsd_org_calsoft/PSME/common/agent-framework/include/agent-framework/module/constants/common.hpp
1332--- rsd_org/PSME/common/agent-framework/include/agent-framework/module/constants/common.hpp 2017-12-15 06:54:00.000000000 +0530
1333+++ rsd_org_calsoft/PSME/common/agent-framework/include/agent-framework/module/constants/common.hpp 2017-12-15 17:57:40.789978871 +0530
1334@@ -52,6 +52,17 @@
1335 static constexpr const char MANUFACTURER[] = "manufacturer";
1336 static constexpr const char MODEL[] = "modelNumber";
1337 static constexpr const char PART[] = "partNumber";
1338+ /* ACL Added Begin */
1339+ static constexpr const char PRODUCT_NAME[] = "productName";
1340+ static constexpr const char MAC_ADDRESS[] = "macAddress";
1341+ static constexpr const char MAC_RANGE[] = "macRange";
1342+ static constexpr const char MANUFACTURE_DATE[] = "manufactureDate";
1343+ static constexpr const char PLATFORM_NAME[] = "platformName";
1344+ static constexpr const char COUNTRY_CODE[] = "countryCode";
1345+ static constexpr const char LABEL_REVISION[] = "labelRevision";
1346+ static constexpr const char DIAG_VERSION[] = "diagVersion";
1347+ static constexpr const char ONIE_VERSION[] = "onieVersion";
1348+ /* ACL Added End */
1349 };
1350
1351 /*!
1352diff -ruN rsd_org/PSME/common/agent-framework/include/agent-framework/module/constants/pnc.hpp rsd_org_calsoft/PSME/common/agent-framework/include/agent-framework/module/constants/pnc.hpp
1353--- rsd_org/PSME/common/agent-framework/include/agent-framework/module/constants/pnc.hpp 2017-12-15 06:54:00.000000000 +0530
1354+++ rsd_org_calsoft/PSME/common/agent-framework/include/agent-framework/module/constants/pnc.hpp 2017-12-19 13:12:07.532048705 +0530
1355@@ -68,6 +68,7 @@
1356 static constexpr const char PORT[] = "port";
1357 static constexpr const char STATUS[] = "status";
1358 static constexpr const char PORT_ID[] = "portId";
1359+ static constexpr const char BIAS_CURRENT[] = "bias_current";
1360 static constexpr const char PORT_TYPE[] = "portType";
1361 static constexpr const char CABLE_ID[] = "cableId";
1362 static constexpr const char OPERATIONAL_STATE[] = "operationalState";
1363diff -ruN rsd_org/PSME/common/agent-framework/include/agent-framework/module/model/attributes/fru_info.hpp rsd_org_calsoft/PSME/common/agent-framework/include/agent-framework/module/model/attributes/fru_info.hpp
1364--- rsd_org/PSME/common/agent-framework/include/agent-framework/module/model/attributes/fru_info.hpp 2017-12-15 06:54:00.000000000 +0530
1365+++ rsd_org_calsoft/PSME/common/agent-framework/include/agent-framework/module/model/attributes/fru_info.hpp 2017-12-15 17:57:53.069981406 +0530
1366@@ -40,10 +40,32 @@
1367 FruInfo(const std::string& serial_number,
1368 const std::string& manufacturer,
1369 const std::string& model_number,
1370+ /* ACL Added Begin */
1371+ const std::string& product_name,
1372+ const std::string& mac_address,
1373+ const std::string& mac_range,
1374+ const std::string& manufacture_date,
1375+ const std::string& platform_name,
1376+ const std::string& label_revision,
1377+ const std::string& country_code,
1378+ const std::string& diag_version,
1379+ const std::string& onie_version,
1380+ /* ACL Added End */
1381 const std::string& part_number):
1382 m_serial_number{serial_number},
1383 m_manufacturer{manufacturer},
1384 m_model_number{model_number},
1385+ /* ACL Added Begin */
1386+ m_product_name{product_name},
1387+ m_mac_address{mac_address},
1388+ m_mac_range{mac_range},
1389+ m_manufacture_date{manufacture_date},
1390+ m_platform_name{platform_name},
1391+ m_label_revision{label_revision},
1392+ m_country_code{country_code},
1393+ m_diag_version{diag_version},
1394+ m_onie_version{onie_version},
1395+ /* ACL Added End */
1396 m_part_number{part_number}
1397 {}
1398
1399@@ -120,6 +142,151 @@
1400 return m_part_number;
1401 }
1402
1403+ /* ACL Added Begin */
1404+ /*!
1405+ * Sets product name
1406+ *
1407+ * @param[in] product name product name
1408+ * */
1409+ void set_product_name(const OptionalField<std::string>& product_name) {
1410+ m_product_name = product_name;
1411+ }
1412+
1413+ /*!
1414+ * Gets product name
1415+ * */
1416+ const OptionalField<std::string>& get_product_name() const {
1417+ return m_product_name;
1418+ }
1419+
1420+ /*!
1421+ * Sets MAC address
1422+ *
1423+ * @param[in] MAC address MAC address
1424+ * */
1425+ void set_mac_address(const OptionalField<std::string>& mac_address) {
1426+ m_mac_address = mac_address;
1427+ }
1428+
1429+ /*!
1430+ * Gets MAC address
1431+ * */
1432+ const OptionalField<std::string>& get_mac_address() const {
1433+ return m_mac_address;
1434+ }
1435+
1436+ /*!
1437+ * Sets MAC Range
1438+ *
1439+ * @param[in] MAC Range MAC Range
1440+ * */
1441+ void set_mac_range(const OptionalField<std::string>& mac_range) {
1442+ m_mac_range = mac_range;
1443+ }
1444+
1445+ /*!
1446+ * Gets MAC range
1447+ * */
1448+ const OptionalField<std::string>& get_mac_range() const {
1449+ return m_mac_range;
1450+ }
1451+
1452+ /*!
1453+ * Sets Manufacture date
1454+ *
1455+ * @param[in] Manufacture date Manufacture date
1456+ * */
1457+ void set_manufacture_date(const OptionalField<std::string>& manufacture_date) {
1458+ m_manufacture_date = manufacture_date;
1459+ }
1460+
1461+ /*!
1462+ * Gets Manufacture date
1463+ * */
1464+ const OptionalField<std::string>& get_manufacture_date() const {
1465+ return m_manufacture_date;
1466+ }
1467+
1468+ /*!
1469+ * Sets Platform Name
1470+ *
1471+ * @param[in] Platform Name Platform Name
1472+ * */
1473+ void set_platform_name(const OptionalField<std::string>& platform_name) {
1474+ m_platform_name = platform_name;
1475+ }
1476+
1477+ /*!
1478+ * Gets Platform Name
1479+ * */
1480+ const OptionalField<std::string>& get_platform_name() const {
1481+ return m_platform_name;
1482+ }
1483+
1484+ /*!
1485+ * Sets Label Revision
1486+ *
1487+ * @param[in] Label Revision Label Revision
1488+ * */
1489+ void set_label_revision(const OptionalField<std::string>& label_revision) {
1490+ m_label_revision = label_revision;
1491+ }
1492+
1493+ /*!
1494+ * Gets Label Revision
1495+ * */
1496+ const OptionalField<std::string>& get_label_revision() const {
1497+ return m_label_revision;
1498+ }
1499+
1500+ /*!
1501+ * Sets Country Code
1502+ *
1503+ * @param[in] Country Code Country Code
1504+ * */
1505+ void set_country_code(const OptionalField<std::string>& country_code) {
1506+ m_country_code = country_code;
1507+ }
1508+
1509+ /*!
1510+ * Gets Country Code
1511+ * */
1512+ const OptionalField<std::string>& get_country_code() const {
1513+ return m_country_code;
1514+ }
1515+
1516+ /*!
1517+ * Sets Diag Version
1518+ *
1519+ * @param[in] Diag version Diag version
1520+ * */
1521+ void set_diag_version(const OptionalField<std::string>& diag_version) {
1522+ m_diag_version = diag_version;
1523+ }
1524+
1525+ /*!
1526+ * Gets Diag Version
1527+ * */
1528+ const OptionalField<std::string>& get_diag_version() const {
1529+ return m_diag_version;
1530+ }
1531+
1532+ /*!
1533+ * Sets Onie Version
1534+ *
1535+ * @param[in] Onie version Onie version
1536+ * */
1537+ void set_onie_version(const OptionalField<std::string>& onie_version) {
1538+ m_onie_version = onie_version;
1539+ }
1540+
1541+ /*!
1542+ * Gets Onie Version
1543+ * */
1544+ const OptionalField<std::string>& get_onie_version() const {
1545+ return m_onie_version;
1546+ }
1547+/* ACL Added End */
1548 /*!
1549 * Converts this to json representation.
1550 *
1551@@ -141,6 +308,17 @@
1552 OptionalField<std::string> m_manufacturer{};
1553 OptionalField<std::string> m_model_number{};
1554 OptionalField<std::string> m_part_number{};
1555+ /* ACL Added Begin */
1556+ OptionalField<std::string> m_product_name{};
1557+ OptionalField<std::string> m_mac_address{};
1558+ OptionalField<std::string> m_mac_range{};
1559+ OptionalField<std::string> m_manufacture_date{};
1560+ OptionalField<std::string> m_platform_name{};
1561+ OptionalField<std::string> m_country_code{};
1562+ OptionalField<std::string> m_label_revision{};
1563+ OptionalField<std::string> m_diag_version{};
1564+ OptionalField<std::string> m_onie_version{};
1565+ /* ACL Added End */
1566 };
1567
1568 }
1569diff -ruN rsd_org/PSME/common/agent-framework/include/agent-framework/module/model/power_zone.hpp rsd_org_calsoft/PSME/common/agent-framework/include/agent-framework/module/model/power_zone.hpp
1570--- rsd_org/PSME/common/agent-framework/include/agent-framework/module/model/power_zone.hpp 2017-12-19 13:19:16.496042958 +0530
1571+++ rsd_org_calsoft/PSME/common/agent-framework/include/agent-framework/module/model/power_zone.hpp 2017-12-15 17:58:03.141982386 +0530
1572@@ -127,6 +127,43 @@
1573 void set_power_output(const OptionalField<double> power_output) {
1574 m_power_output = power_output;
1575 }
1576+ /* ACL Added Begin */
1577+ /*!
1578+ * @brief setter for psu_fan_output attribute
1579+ *
1580+ * @param psu_fan_output of type double
1581+ */
1582+ void set_fan_output(const OptionalField<double> fan_output) {
1583+ m_fan_output = fan_output;
1584+ }
1585+
1586+ /*!
1587+ * @brief return psu_fan_output attribute
1588+ *
1589+ * @return the psu fan output value
1590+ */
1591+ OptionalField<double> get_fan_output() const {
1592+ return m_fan_output;
1593+ }
1594+
1595+ /*!
1596+ * @brief setter for psu_temp_output attribute
1597+ *
1598+ * @param psu_temp_output of type double
1599+ */
1600+ void set_temp_output(const OptionalField<double> temp_output) {
1601+ m_temp_output = temp_output;
1602+ }
1603+
1604+ /*!
1605+ * @brief return psu_temp_output attribute
1606+ *
1607+ * @return psu_temp_output of type double
1608+ */
1609+ OptionalField<double> get_temp_output() const {
1610+ return m_temp_output;
1611+ }
1612+ /* ACL Added Begin */
1613
1614 /*Nick Added Begin: */
1615 /*!
1616@@ -179,6 +216,10 @@
1617
1618 OptionalField<double> m_power_input{0.0};
1619 OptionalField<double> m_power_output{0.0};
1620+ /* ACL Added Begin */
1621+ OptionalField<double> m_fan_output{0.0};
1622+ OptionalField<double> m_temp_output{0.0};
1623+ /* ACL Added End */
1624 OptionalField<double> m_power_capacity{0.0};
1625
1626 static const enums::CollectionName collection_name;
1627diff -ruN rsd_org/PSME/common/agent-framework/include/agent-framework/module/model/psu.hpp rsd_org_calsoft/PSME/common/agent-framework/include/agent-framework/module/model/psu.hpp
1628--- rsd_org/PSME/common/agent-framework/include/agent-framework/module/model/psu.hpp 2017-12-19 13:19:16.496042958 +0530
1629+++ rsd_org_calsoft/PSME/common/agent-framework/include/agent-framework/module/model/psu.hpp 2017-12-15 17:58:10.985982559 +0530
1630@@ -137,6 +137,44 @@
1631 m_power_output = power_output;
1632 }
1633
1634+ /* ACL Added Begin */
1635+ /*!
1636+
1637+ * @brief return fan_output of type double
1638+ *
1639+ * @return the fan_output value
1640+ */
1641+ OptionalField<double> get_fan_output() const {
1642+ return m_fan_output;
1643+ }
1644+
1645+ /*!
1646+ * @brief setter for fan_output attribute
1647+ *
1648+ * @param fan_output of type double
1649+ */
1650+ void set_fan_output(const OptionalField<double> fan_output) {
1651+ m_fan_output = fan_output;
1652+ }
1653+
1654+ /*!
1655+ * @brief return temp_output of type double
1656+ *
1657+ * @return the temp_output value
1658+ */
1659+ OptionalField<double> get_temp_output() const {
1660+ return m_temp_output;
1661+ }
1662+
1663+ /*!
1664+ * @brief setter for temp_output attribute
1665+ *
1666+ * @param temp_output of type double
1667+ */
1668+ void set_temp_output(const OptionalField<double> temp_output) {
1669+ m_temp_output = temp_output;
1670+ }
1671+/* ACL Added End */
1672 /*!
1673 * @brief return an object fru_info of class attribute::FruInfo
1674 *
1675@@ -201,6 +239,10 @@
1676 OptionalField<uint32_t> m_slot{0u};
1677 OptionalField<double> m_power_input{0.0};
1678 OptionalField<double> m_power_output{0.0};
1679+ /* ACL Added Begin */
1680+ OptionalField<double> m_temp_output{0.0};
1681+ OptionalField<double> m_fan_output{0.0};
1682+ /* ACL Added End */
1683 OptionalField<double> m_power_capacity{0.0};
1684 attribute::FruInfo m_fru_info{};
1685 /*Nick Added Begin: */
1686diff -ruN rsd_org/PSME/common/agent-framework/src/module/constants/chassis.cpp rsd_org_calsoft/PSME/common/agent-framework/src/module/constants/chassis.cpp
1687--- rsd_org/PSME/common/agent-framework/src/module/constants/chassis.cpp 2017-12-19 13:19:16.496042958 +0530
1688+++ rsd_org_calsoft/PSME/common/agent-framework/src/module/constants/chassis.cpp 2017-12-15 17:58:27.809982930 +0530
1689@@ -74,6 +74,10 @@
1690 constexpr const char Psu::SLOT[];
1691 constexpr const char Psu::POWER_INPUT[];
1692 constexpr const char Psu::POWER_OUTPUT[];
1693+/* ACL Added Begin */
1694+constexpr const char Psu::TEMP_OUTPUT[];
1695+constexpr const char Psu::FAN_OUTPUT[];
1696+/* ACL Added End */
1697 constexpr const char Psu::POWER_CAPACITY[];
1698 constexpr const char Psu::FRU_INFO[];
1699 constexpr const char Psu::OEM[];
1700@@ -88,6 +92,10 @@
1701 constexpr const char PowerZone::STATUS[];
1702 constexpr const char PowerZone::POWER_INPUT[];
1703 constexpr const char PowerZone::POWER_OUTPUT[];
1704+/* ACL Added Begin */
1705+constexpr const char PowerZone::TEMP_OUTPUT[];
1706+constexpr const char PowerZone::FAN_OUTPUT[];
1707+/* ACL Added End */
1708 constexpr const char PowerZone::POWER_CAPACITY[];
1709 constexpr const char PowerZone::COLLECTIONS[];
1710 constexpr const char PowerZone::OEM[];
1711diff -ruN rsd_org/PSME/common/agent-framework/src/module/constants/common.cpp rsd_org_calsoft/PSME/common/agent-framework/src/module/constants/common.cpp
1712--- rsd_org/PSME/common/agent-framework/src/module/constants/common.cpp 2017-12-15 06:54:00.000000000 +0530
1713+++ rsd_org_calsoft/PSME/common/agent-framework/src/module/constants/common.cpp 2017-12-15 17:58:32.633983036 +0530
1714@@ -41,6 +41,17 @@
1715 constexpr const char FruInfo::MANUFACTURER[];
1716 constexpr const char FruInfo::MODEL[];
1717 constexpr const char FruInfo::PART[];
1718+/* ACL Added Begin */
1719+constexpr const char FruInfo::PRODUCT_NAME[];
1720+constexpr const char FruInfo::MAC_ADDRESS[];
1721+constexpr const char FruInfo::MAC_RANGE[];
1722+constexpr const char FruInfo::PLATFORM_NAME[];
1723+constexpr const char FruInfo::MANUFACTURE_DATE[];
1724+constexpr const char FruInfo::COUNTRY_CODE[];
1725+constexpr const char FruInfo::LABEL_REVISION[];
1726+constexpr const char FruInfo::DIAG_VERSION[];
1727+constexpr const char FruInfo::ONIE_VERSION[];
1728+/* ACL Added End */
1729
1730 constexpr const char Collections::COLLECTIONS[];
1731 constexpr const char Collections::NAME[];
1732diff -ruN rsd_org/PSME/common/agent-framework/src/module/model/attributes/fru_info.cpp rsd_org_calsoft/PSME/common/agent-framework/src/module/model/attributes/fru_info.cpp
1733--- rsd_org/PSME/common/agent-framework/src/module/model/attributes/fru_info.cpp 2017-12-15 06:54:00.000000000 +0530
1734+++ rsd_org_calsoft/PSME/common/agent-framework/src/module/model/attributes/fru_info.cpp 2017-12-15 17:58:40.433983208 +0530
1735@@ -39,6 +39,17 @@
1736 json[literals::FruInfo::PART] = get_part_number();
1737 json[literals::FruInfo::SERIAL] = get_serial_number();
1738 json[literals::FruInfo::MODEL] = get_model_number();
1739+/* ACL Added Begin */
1740+ json[literals::FruInfo::PRODUCT_NAME] = get_product_name();
1741+ json[literals::FruInfo::MAC_ADDRESS] = get_mac_address();
1742+ json[literals::FruInfo::MAC_RANGE] = get_mac_range();
1743+ json[literals::FruInfo::MANUFACTURE_DATE] = get_manufacture_date();
1744+ json[literals::FruInfo::PLATFORM_NAME] = get_platform_name();
1745+ json[literals::FruInfo::COUNTRY_CODE] = get_country_code();
1746+ json[literals::FruInfo::LABEL_REVISION] = get_label_revision();
1747+ json[literals::FruInfo::DIAG_VERSION] = get_diag_version();
1748+ json[literals::FruInfo::ONIE_VERSION] = get_onie_version();
1749+/* ACL Added End */
1750 return json;
1751 }
1752
1753@@ -48,5 +59,16 @@
1754 fru_info.set_manufacturer(json[literals::FruInfo::MANUFACTURER]);
1755 fru_info.set_model_number(json[literals::FruInfo::MODEL]);
1756 fru_info.set_part_number(json[literals::FruInfo::PART]);
1757+/* ACL Added Begin */
1758+ fru_info.set_product_name(json[literals::FruInfo::PRODUCT_NAME]);
1759+ fru_info.set_mac_address(json[literals::FruInfo::MAC_ADDRESS]);
1760+ fru_info.set_mac_range(json[literals::FruInfo::MAC_RANGE]);
1761+ fru_info.set_manufacture_date(json[literals::FruInfo::MANUFACTURE_DATE]);
1762+ fru_info.set_platform_name(json[literals::FruInfo::PLATFORM_NAME]);
1763+ fru_info.set_country_code(json[literals::FruInfo::COUNTRY_CODE]);
1764+ fru_info.set_label_revision(json[literals::FruInfo::LABEL_REVISION]);
1765+ fru_info.set_diag_version(json[literals::FruInfo::DIAG_VERSION]);
1766+ fru_info.set_onie_version(json[literals::FruInfo::ONIE_VERSION]);
1767+/* ACL Added End */
1768 return fru_info;
1769 }
1770diff -ruN rsd_org/PSME/common/agent-framework/src/module/model/power_zone.cpp rsd_org_calsoft/PSME/common/agent-framework/src/module/model/power_zone.cpp
1771--- rsd_org/PSME/common/agent-framework/src/module/model/power_zone.cpp 2017-12-19 13:19:16.496042958 +0530
1772+++ rsd_org_calsoft/PSME/common/agent-framework/src/module/model/power_zone.cpp 2017-12-15 17:58:48.009983375 +0530
1773@@ -40,6 +40,10 @@
1774 result[literals::PowerZone::STATUS] = get_status().to_json();
1775 result[literals::PowerZone::POWER_INPUT] = get_power_input();
1776 result[literals::PowerZone::POWER_OUTPUT] = get_power_output();
1777+/* ACL Added Begin */
1778+ result[literals::PowerZone::TEMP_OUTPUT] = get_temp_output();
1779+ result[literals::PowerZone::FAN_OUTPUT] = get_fan_output();
1780+/* ACL Added End */
1781 result[literals::PowerZone::POWER_CAPACITY] = get_power_capacity();
1782 result[literals::PowerZone::COLLECTIONS] = get_collections().to_json();
1783 result[literals::PowerZone::OEM] = get_oem().to_json();
1784@@ -56,6 +60,10 @@
1785 zone.set_status(attribute::Status::from_json(json[literals::PowerZone::STATUS]));
1786 zone.set_power_input(json[literals::PowerZone::POWER_INPUT]);
1787 zone.set_power_output(json[literals::PowerZone::POWER_OUTPUT]);
1788+/* ACL Added Begin */
1789+ zone.set_fan_output(json[literals::PowerZone::FAN_OUTPUT]);
1790+ zone.set_temp_output(json[literals::PowerZone::TEMP_OUTPUT]);
1791+/* ACL Added End */
1792 zone.set_power_capacity(
1793 json[literals::PowerZone::POWER_CAPACITY]);
1794 zone.set_collections(Collections::from_json(
1795diff -ruN rsd_org/PSME/common/agent-framework/src/module/model/psu.cpp rsd_org_calsoft/PSME/common/agent-framework/src/module/model/psu.cpp
1796--- rsd_org/PSME/common/agent-framework/src/module/model/psu.cpp 2017-12-19 13:19:16.496042958 +0530
1797+++ rsd_org_calsoft/PSME/common/agent-framework/src/module/model/psu.cpp 2017-12-15 17:58:54.681983522 +0530
1798@@ -39,6 +39,10 @@
1799 result[literals::Psu::SLOT] = get_slot();
1800 result[literals::Psu::POWER_INPUT] = get_power_input();
1801 result[literals::Psu::POWER_OUTPUT] = get_power_output();
1802+/* ACL Added Begin */
1803+ result[literals::Psu::FAN_OUTPUT] = get_fan_output();
1804+ result[literals::Psu::TEMP_OUTPUT] = get_temp_output();
1805+/* ACL Added End */
1806 result[literals::Psu::POWER_CAPACITY] = get_power_capacity();
1807 result[literals::Psu::FRU_INFO] = get_fru_info().to_json();
1808 result[literals::Psu::OEM] = get_oem().to_json();
1809@@ -56,6 +60,10 @@
1810 psu.set_slot(json[literals::Psu::SLOT].asUInt());
1811 psu.set_power_input(json[literals::Psu::POWER_INPUT].asDouble());
1812 psu.set_power_output(json[literals::Psu::POWER_OUTPUT].asDouble());
1813+/* ACL Added Begin */
1814+ psu.set_fan_output(json[literals::Psu::FAN_OUTPUT].asDouble());
1815+ psu.set_temp_output(json[literals::Psu::TEMP_OUTPUT].asDouble());
1816+/* ACL Added End */
1817 psu.set_power_capacity(json[literals::Psu::POWER_CAPACITY].asDouble());
1818 psu.set_oem(attribute::Oem::from_json(json[literals::Psu::OEM]));
1819 psu.set_resource_hash(json);
1820diff -ruN rsd_org/RMM/src/core/snmp_subagentd/CMakeLists.txt rsd_org_calsoft/RMM/src/core/snmp_subagentd/CMakeLists.txt
1821--- rsd_org/RMM/src/core/snmp_subagentd/CMakeLists.txt 2017-12-15 06:54:00.000000000 +0530
1822+++ rsd_org_calsoft/RMM/src/core/snmp_subagentd/CMakeLists.txt 2017-12-15 17:59:01.145983664 +0530
1823@@ -1,13 +1,13 @@
1824-SET(TARGET SNMPSubagentd)
1825-
1826-AUX_SOURCE_DIRECTORY(. SRC_LIST)
1827-
1828-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
1829-
1830-LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lib)
1831-SET(SNMP_AGENT_NEED_LIBS librmm_init.so librmm_cfg.so librmm_redfish.so librmm_wrap.so librmm_log.so librmm_utils.a librmm_jsonrpcapi.so librmm_jsonrpc.so librmm_json.so libnetsnmpmibs.a libnetsnmpagent.a libnetsnmp.a libcrypto.a libssl.a libcurl.a librmm_jsonrpcapi.so librmm_securec.so)
1832-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/include)
1833-INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include)
1834-
1835-ADD_EXECUTABLE(${TARGET} ${SRC_LIST})
1836-TARGET_LINK_LIBRARIES(${TARGET} ${SNMP_AGENT_NEED_LIBS} libuuid.so libdl.so)
1837+#SET(TARGET SNMPSubagentd)
1838+#
1839+#AUX_SOURCE_DIRECTORY(. SRC_LIST)
1840+#
1841+#SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
1842+#
1843+#LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lib)
1844+#SET(SNMP_AGENT_NEED_LIBS librmm_init.so librmm_cfg.so librmm_redfish.so librmm_wrap.so librmm_log.so librmm_utils.a librmm_jsonrpcapi.so librmm_jsonrpc.so librmm_json.so libnetsnmpmibs.a libnetsnmpagent.a libnetsnmp.a libcrypto.a libssl.a libcurl.a librmm_jsonrpcapi.so librmm_securec.so)
1845+#INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/include)
1846+#INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include)
1847+#
1848+#ADD_EXECUTABLE(${TARGET} ${SRC_LIST})
1849+#TARGET_LINK_LIBRARIES(${TARGET} ${SNMP_AGENT_NEED_LIBS} libuuid.so libdl.so)
1850diff -ruN rsd_org/RMM/src/deps/CMakeLists.txt rsd_org_calsoft/RMM/src/deps/CMakeLists.txt
1851--- rsd_org/RMM/src/deps/CMakeLists.txt 2017-12-15 06:54:00.000000000 +0530
1852+++ rsd_org_calsoft/RMM/src/deps/CMakeLists.txt 2017-12-15 17:59:05.777983766 +0530
1853@@ -1,6 +1,6 @@
1854 ADD_SUBDIRECTORY(uuid)
1855 ADD_SUBDIRECTORY(openssl)
1856 ADD_SUBDIRECTORY(libcurl)
1857-ADD_SUBDIRECTORY(snmp)
1858-ADD_SUBDIRECTORY(stunnel)
1859-ADD_SUBDIRECTORY(flatui)
1860+#ADD_SUBDIRECTORY(snmp)
1861+#ADD_SUBDIRECTORY(stunnel)
1862+#ADD_SUBDIRECTORY(flatui)
1863diff -ruN rsd_org/RMM/utils/deb_maker/install/multi-deb/sh/prepare.sh rsd_org_calsoft/RMM/utils/deb_maker/install/multi-deb/sh/prepare.sh
1864--- rsd_org/RMM/utils/deb_maker/install/multi-deb/sh/prepare.sh 2017-12-19 13:19:16.596042956 +0530
1865+++ rsd_org_calsoft/RMM/utils/deb_maker/install/multi-deb/sh/prepare.sh 2017-12-15 17:59:22.449984133 +0530
1866@@ -56,11 +56,11 @@
1867 cp $PROJ_PATH/build/utils/redfish/MR.json $ITEM_PATH/var/rmm/redfish
1868 cp $PROJ_PATH/build/utils/cfg/rmm.cfg $ITEM_PATH/etc/rmm
1869 cp $PROJ_PATH/build/utils/cfg/pwm_rpm.cfg $ITEM_PATH/etc/rmm
1870-cp $PROJ_PATH/build/utils/encrypt_text/keyfile $ITEM_PATH/etc/rmm
1871+#cp $PROJ_PATH/build/utils/encrypt_text/keyfile $ITEM_PATH/etc/rmm
1872 cp $PROJ_PATH/src/VERSION $ITEM_PATH/etc/rmm
1873
1874-cp $PROJ_PATH/build/bin/ptasd $ITEM_PATH/usr/local/bin/
1875-cp $PROJ_PATH/build/bin/OEM_coe_file $ITEM_PATH/var/rmm/
1876+#cp $PROJ_PATH/build/bin/ptasd $ITEM_PATH/usr/local/bin/
1877+#cp $PROJ_PATH/build/bin/OEM_coe_file $ITEM_PATH/var/rmm/
1878 cp $PROJ_PATH/build/bin/Memdbd $ITEM_PATH/usr/local/bin/
1879 cp $PROJ_PATH/build/bin/IPMIModule $ITEM_PATH/usr/local/bin
1880 cp $PROJ_PATH/build/bin/Assetd $ITEM_PATH/usr/local/bin
1881@@ -68,10 +68,10 @@
1882 cp $PROJ_PATH/build/bin/Registerd $ITEM_PATH/usr/local/bin
1883 cp $PROJ_PATH/build/bin/RMMLogd $ITEM_PATH/usr/local/bin
1884 cp $PROJ_PATH/build/bin/Upgraded $ITEM_PATH/usr/local/bin
1885-cp $PROJ_PATH/build/bin/SNMPSubagentd $ITEM_PATH/usr/local/bin
1886+#cp $PROJ_PATH/build/bin/SNMPSubagentd $ITEM_PATH/usr/local/bin
1887 cp $PROJ_PATH/build/bin/cm_reset $ITEM_PATH/usr/local/bin
1888-cp $PROJ_PATH/build/bin/snmpd $ITEM_PATH/usr/local/bin
1889-cp $PROJ_PATH/build/bin/stunnel $ITEM_PATH/usr/local/bin
1890+#cp $PROJ_PATH/build/bin/snmpd $ITEM_PATH/usr/local/bin
1891+#cp $PROJ_PATH/build/bin/stunnel $ITEM_PATH/usr/local/bin
1892 cp $PROJ_PATH/build/bin/rmm_post_install $ITEM_PATH/usr/local/bin
1893 cp $PROJ_PATH/build/bin/rmm_super $ITEM_PATH/usr/local/bin
1894
1895@@ -90,7 +90,7 @@
1896
1897
1898 cp $PSME_PROJ_PATH/bin/psme-rest-server $ITEM_PATH/usr/local/bin
1899-cp $PSME_PROJ_PATH/bin/psme-network-stubs $ITEM_PATH/usr/local/bin
1900+#cp $PSME_PROJ_PATH/bin/psme-network-stubs $ITEM_PATH/usr/local/bin
1901 cp $PSME_PROJ_PATH/bin/psme-chassis $ITEM_PATH/usr/local/bin
1902 cp $PSME_PROJ_PATH/lib/libjsoncpp.so.999 $ITEM_PATH/usr/local/lib
1903 cp $PSME_PROJ_PATH/lib/libjsonrpccpp-server.so.999 $ITEM_PATH/usr/local/lib
1904@@ -141,13 +141,13 @@
1905 $CUR_PATH/modify_ver.sh $ITEM_PATH
1906
1907 #5
1908-ITEM_PATH=$CUR_PATH/../net-snmp
1909+#ITEM_PATH=$CUR_PATH/../net-snmp
1910
1911 mkdir -p $ITEM_PATH/usr/local/bin
1912 del_file $ITEM_PATH/usr/local/bin/
1913
1914-mkdir -p $ITEM_PATH/etc/snmp
1915-del_file $ITEM_PATH/etc/snmp/
1916+#mkdir -p $ITEM_PATH/etc/snmp
1917+#del_file $ITEM_PATH/etc/snmp/
1918
1919 mkdir -p $ITEM_PATH/usr/local/lib
1920 del_file $ITEM_PATH/usr/local/lib/
1921@@ -155,10 +155,10 @@
1922 #mkdir -p $ITEM_PATH/usr/local/share/snmp/mibs
1923 #del_file $ITEM_PATH/usr/local/share/snmp/mibs
1924
1925-cp $PROJ_PATH/build/lib/libnet* $ITEM_PATH/usr/local/lib
1926-cp $PROJ_PATH/build/bin/snmp* $ITEM_PATH/usr/local/bin/
1927+#cp $PROJ_PATH/build/lib/libnet* $ITEM_PATH/usr/local/lib
1928+#cp $PROJ_PATH/build/bin/snmp* $ITEM_PATH/usr/local/bin/
1929 #copy snmp config file
1930-cp $PROJ_PATH/src/core/snmp_subagentd/config/*.conf $ITEM_PATH/etc/snmp/
1931+#cp $PROJ_PATH/src/core/snmp_subagentd/config/*.conf $ITEM_PATH/etc/snmp/
1932 #copy mibs file
1933 #cp $PROJ_PATH/src/core/snmp_subagentd/*.txt $ITEM_PATH/usr/local/share/snmp/mibs/
1934 #cp $PROJ_PATH/src/dep/snmp/net-snmp-5.7.3/mibs/*.txt $ITEM_PATH/usr/local/share/snmp/mibs/