-
Notifications
You must be signed in to change notification settings - Fork 9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
CP-46076 for XS9: To remove fcoe-utils, remove FCOE capabilty with LLDPAD tools from bugtool? #111
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -118,8 +118,6 @@ GRUB_EFI_CONFIG = '/boot/efi/EFI/xenserver/grub.cfg' | |
BOOT_KERNEL = '/boot/vmlinuz-' + OS_RELEASE | ||
BOOT_INITRD = '/boot/initrd-' + OS_RELEASE + '.img' | ||
PROC_PARTITIONS = '/proc/partitions' | ||
FCOE_BLACKLIST_FILE = '/etc/sysconfig/fcoe-blacklist' | ||
FCOE_CONFIG_DIR = '/etc/fcoe/' | ||
FSTAB = '/etc/fstab' | ||
PROC_MOUNTS = '/proc/mounts' | ||
ISCSI_CONF = '/etc/iscsi/iscsid.conf' | ||
|
@@ -268,7 +266,6 @@ BIOSDEVNAME = 'biosdevname' | |
BRCTL = 'brctl' | ||
CHKCONFIG = 'chkconfig' | ||
CHRONYC = 'chronyc' | ||
DCBTOOL = 'dcbtool' | ||
DF = 'df' | ||
DU = 'du' | ||
DMESG = 'dmesg' | ||
|
@@ -277,7 +274,6 @@ DMSETUP = 'dmsetup' | |
EBTABLES = 'ebtables' | ||
EFIBOOTMGR = 'efibootmgr' | ||
ETHTOOL = 'ethtool' | ||
FCOEADM = 'fcoeadm' | ||
FDISK = 'fdisk' | ||
HA_QUERY_LIVESET = '/opt/xensource/debug/debug_ha_query_liveset' | ||
HDPARM = 'hdparm' | ||
|
@@ -286,7 +282,6 @@ IPTABLES = 'iptables' | |
ISCSIADM = 'iscsiadm' | ||
KPATCH = 'kpatch' | ||
LIST_DOMAINS = 'list_domains' | ||
LLDPTOOL = 'lldptool' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Only as a side note, for reference (obsolete) as this PR is not needed: This package is not a file from rpm -qf /usr/sbin/lldptool
lldpad-1.0.1-10.xs8.x86_64 |
||
LOSETUP = 'losetup' | ||
LS = 'ls' | ||
LSBLK = 'lsblk' | ||
|
@@ -370,7 +365,6 @@ CAP_BLOBS = 'blobs' | |
CAP_BOOT_LOADER = 'boot-loader' | ||
CAP_DEVICE_MODEL = 'device-model' | ||
CAP_DISK_INFO = 'disk-info' | ||
CAP_FCOE = 'fcoe' | ||
CAP_FIRSTBOOT = 'firstboot' | ||
CAP_HARDWARE_INFO = 'hardware-info' | ||
CAP_HDPARM_T = 'hdparm-t' | ||
|
@@ -437,7 +431,6 @@ cap(CAP_BOOT_LOADER, PII_NO, max_size=3*KB, | |
cap(CAP_DEVICE_MODEL, PII_YES, min_size=200*KB, max_size=8*MB) | ||
cap(CAP_DISK_INFO, PII_MAYBE, max_size=8*MB, | ||
max_time=120) | ||
cap(CAP_FCOE, PII_YES, max_size=4*KB, max_time=10) | ||
cap(CAP_FIRSTBOOT, PII_YES, min_size=60*KB, max_size=80*KB) | ||
cap(CAP_HARDWARE_INFO, PII_MAYBE, max_size=800*KB, | ||
max_time=60) | ||
|
@@ -835,7 +828,7 @@ def main(argv=None): # pylint: disable=too-many-statements,too-many-branches | |
|
||
if os.getenv('XEN_RT'): | ||
entries = [CAP_BLOBS, CAP_BOOT_LOADER, # pragma: no cover | ||
CAP_DEVICE_MODEL, CAP_DISK_INFO, CAP_FCOE, CAP_FIRSTBOOT, | ||
CAP_DEVICE_MODEL, CAP_DISK_INFO, CAP_FIRSTBOOT, | ||
CAP_HARDWARE_INFO, CAP_HOST_CRASHDUMP_LOGS, CAP_KERNEL_INFO, CAP_LOSETUP_A, | ||
CAP_NETWORK_CONFIG, CAP_NETWORK_STATUS, CAP_PROCESS_LIST, CAP_HIGH_AVAILABILITY, | ||
CAP_PAM, CAP_MULTIPATH, | ||
|
@@ -1116,33 +1109,6 @@ exclude those logs from the archive. | |
cmd_output(CAP_NETWORK_STATUS, [OVS_APPCTL, 'bond/show', b]) | ||
tree_output(CAP_NETWORK_STATUS, SYS_NETBACK_DEBUG) | ||
|
||
cmd_output(CAP_FCOE, [FCOEADM, '-i']) | ||
cmd_output(CAP_FCOE, [FCOEADM, '-t']) | ||
tree_output(CAP_FCOE, FCOE_CONFIG_DIR) | ||
file_output(CAP_FCOE, [FCOE_BLACKLIST_FILE]) | ||
|
||
for p in os.listdir('/sys/class/net/'): | ||
if p.startswith('eth') and p.isalnum(): | ||
cmd_output(CAP_FCOE, [DCBTOOL, 'gc', p, 'dcb']) | ||
cmd_output(CAP_FCOE, [DCBTOOL, 'gc', p, 'pg']) | ||
cmd_output(CAP_FCOE, [DCBTOOL, 'gc', p, 'pfc']) | ||
cmd_output(CAP_FCOE, [DCBTOOL, 'gc', p, 'app:0']) | ||
cmd_output(CAP_FCOE, [DCBTOOL, 'gc', p, 'll:0']) | ||
cmd_output(CAP_FCOE, [DCBTOOL, 'go', p, 'pg']) | ||
cmd_output(CAP_FCOE, [DCBTOOL, 'go', p, 'pfc']) | ||
cmd_output(CAP_FCOE, [DCBTOOL, 'go', p, 'app:0']) | ||
cmd_output(CAP_FCOE, [DCBTOOL, 'go', p, 'll:0']) | ||
cmd_output(CAP_FCOE, [DCBTOOL, 'gp', p, 'pg']) | ||
cmd_output(CAP_FCOE, [DCBTOOL, 'gp', p, 'pfc']) | ||
cmd_output(CAP_FCOE, [DCBTOOL, 'gp', p, 'app:0']) | ||
cmd_output(CAP_FCOE, [DCBTOOL, 'gp', p, 'll:0']) | ||
cmd_output(CAP_FCOE, [LLDPTOOL, '-t', '-i', p, '-n']) | ||
cmd_output(CAP_FCOE, [LLDPTOOL, '-t', '-i', p]) | ||
cmd_output(CAP_FCOE, [LLDPTOOL, '-t', '-i', p, '-V', 'APP', '-c']) | ||
cmd_output(CAP_FCOE, [LLDPTOOL, '-t', '-i', p, '-V', 'PFC', '-c']) | ||
cmd_output(CAP_FCOE, [LLDPTOOL, '-t', '-i', p, '-V', 'ETS-CFG', '-c']) | ||
cmd_output(CAP_FCOE, [LLDPTOOL, '-t', '-i', p, '-V', 'ETS-REC', '-c']) | ||
|
||
tree_output(CAP_PAM, PAM_DIR) | ||
file_output(CAP_PAM, [KRB5_CONF, SSHD_CONFIG]) | ||
tree_output(CAP_PAM, LIKEWISE_DIR) | ||
|
@@ -2078,10 +2044,6 @@ def update_capabilities(): | |
max_size = caps[CAP_NETWORK_CONFIG][MAX_SIZE] * num_pifs + CAP_NETWORK_CONFIG_OVERHEAD | ||
update_cap_size(CAP_NETWORK_CONFIG, max_size) | ||
|
||
# update FCOE capabilities based on number of PIFs | ||
update_cap_time(CAP_FCOE, caps[CAP_FCOE][MAX_TIME] * num_pifs) | ||
update_cap_size(CAP_FCOE, caps[CAP_FCOE][MAX_SIZE] * num_pifs) | ||
|
||
# compute max time & size based on number of domains, VBDs and VIFs | ||
num_vbds = 0 | ||
if os.path.exists(BLKTAP_DEVICE_PATH): | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only as a side note, for reference (obsolete) as this PR is not needed:
This package is not a file from
fcoe-utils
: