Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions os-discovery-tool/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
FROM ubuntu

# Install necessary packages
RUN apt-get update && \
apt-get update --fix-missing && \
apt-get install -y lshw kmod hwinfo pciutils && \
apt-get clean

# Create a volume for the code
VOLUME /app

# Copy the HCL Scripts to collect driver information
COPY ./netdriver.sh /app/
COPY ./rhcosdockernetversions.sh /app/
COPY ./netdev.sh /app/
COPY ./storagedriver.sh /app/
COPY ./storagedev.sh /app/
COPY ./storagedevnames.sh /app/

# Set the working directory
WORKDIR /app
26 changes: 24 additions & 2 deletions os-discovery-tool/get_linux_inv_to_intersight.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class OsType:
"""This class broadly identifies OS categories."""
SUSE = ["Suse", "Sles"]
DEBIAN = ["Ubuntu"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky", "Rhcos"]
ORACLE = ["ol"]


Expand DownExpand Up@@ -372,6 +372,9 @@ def get_os_inv(self):
elif os_vendor == "Rocky":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rocky-os-name.sh")
elif os_vendor == "Rhcos":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rhcos-os-name.sh")
else:
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "redhat-os-name.sh")
Expand All@@ -389,8 +392,9 @@ def get_os_inv(self):
ExecType.SCRIPT,
QueryType.OS,
"centos-os-name-legacy.sh")
self.os_name = os_name

if os_vendor == "Rhel":
if os_vendor in ["Rhel", "Rhcos"]:
os_vendor = "Red Hat"
elif os_vendor == "Centos":
os_vendor = "CentOS"
Expand DownExpand Up@@ -424,6 +428,15 @@ def __init__(self, hostname, os_type, host_type, os_collection):
self.host_type = host_type
self.os_collection = os_collection

def get_storage_driver_args(self, storageNames):
names = []
output = ''
for name in storageNames:
if name and name not in names:
names.append(name)
output += '"{0} "'.format(name)
return output

def get_driver_inv(self):
"""Collect device and driver data."""
kernel_version = ""
Expand DownExpand Up@@ -467,6 +480,15 @@ def get_driver_inv(self):
QueryType.DRIVER, "suse-storageversions.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT,
QueryType.DRIVER, "suse-storagedev.sh")
elif self.os_type == OsType.REDHAT and "coreos" in os_name.lower():
drivers = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdriver.sh")
versions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetversions.sh")
descriptions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdev.sh")
drivers += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedriver.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedev.sh")
storagenames = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevnames.sh")
storagenameasargs = self.get_storage_driver_args(storagenames)
versions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevversion.sh " + storagenameasargs)
else:
drivers = self.invoke_shell(
ExecType.SCRIPT, QueryType.DRIVER, "netdriver.sh")
Expand Down
Empty file modifiedos-discovery-tool/netdev.sh
100644 → 100755
Empty file.
Empty file modifiedos-discovery-tool/netdriver.sh
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcos-os-name.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
cat /etc/redhat-release | awk '{print $1" "$2" "$3" "$4" "$5" "$7}'
25 changes: 25 additions & 0 deletions os-discovery-tool/rhcosdockernetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
enicdrivername="enic"
for pciaddress in $(${lshwcmd} -C Network 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
drivername=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}'`
if [[ $drivername == *"$enicdrivername"* ]]
then
kernalversion=`uname -r`
echo ${kernalversion%.*}
else
versionstring=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | \
awk -F":" '{print $2}' | xargs ${modinfocmd} 2>/dev/null | grep ^version: | head -n1 | awk '{print $2}' | xargs`
if [ -z "${versionstring}" ]
then
echo `${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}' | \
xargs ${modinfocmd} 2>/dev/null | grep ^vermagic: | awk '{print $2}'`
else
echo ${versionstring}
fi
fi
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdriver.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/rhcosdockernetversions.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedevnames.sh
7 changes: 7 additions & 0 deletions os-discovery-tool/rhcosstoragedevversion.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
modinfocmd=`which modinfo`
for var in "$@"
do
${modinfocmd} ${var} 2>/dev/null| grep -i "version" | head -n1 | awk '{print $2}'
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedriver.sh
Empty file modifiedos-discovery-tool/storagedev.sh
100644 → 100755
Empty file.
9 changes: 9 additions & 0 deletions os-discovery-tool/storagedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
for pciaddress in $(${lshwcmd} -C Storage 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
${lspcicmd} -v -s ${pciaddress} | grep "Kernel driver" | awk -F":" '{print $2}' | xargs;
done
Empty file modifiedos-discovery-tool/storagedriver.sh
100644 → 100755
Empty file.
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
ISPLAT-13588: RedHat CoreOS POC - Initial commit by parthibann · Pull Request #53 · CiscoDevNet/intersight-python-utils · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions os-discovery-tool/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
FROM ubuntu

# Install necessary packages
RUN apt-get update && \
apt-get update --fix-missing && \
apt-get install -y lshw kmod hwinfo pciutils && \
apt-get clean

# Create a volume for the code
VOLUME /app

# Copy the HCL Scripts to collect driver information
COPY ./netdriver.sh /app/
COPY ./rhcosdockernetversions.sh /app/
COPY ./netdev.sh /app/
COPY ./storagedriver.sh /app/
COPY ./storagedev.sh /app/
COPY ./storagedevnames.sh /app/

# Set the working directory
WORKDIR /app
26 changes: 24 additions & 2 deletions os-discovery-tool/get_linux_inv_to_intersight.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class OsType:
"""This class broadly identifies OS categories."""
SUSE = ["Suse", "Sles"]
DEBIAN = ["Ubuntu"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky", "Rhcos"]
ORACLE = ["ol"]


Expand DownExpand Up@@ -372,6 +372,9 @@ def get_os_inv(self):
elif os_vendor == "Rocky":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rocky-os-name.sh")
elif os_vendor == "Rhcos":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rhcos-os-name.sh")
else:
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "redhat-os-name.sh")
Expand All@@ -389,8 +392,9 @@ def get_os_inv(self):
ExecType.SCRIPT,
QueryType.OS,
"centos-os-name-legacy.sh")
self.os_name = os_name

if os_vendor == "Rhel":
if os_vendor in ["Rhel", "Rhcos"]:
os_vendor = "Red Hat"
elif os_vendor == "Centos":
os_vendor = "CentOS"
Expand DownExpand Up@@ -424,6 +428,15 @@ def __init__(self, hostname, os_type, host_type, os_collection):
self.host_type = host_type
self.os_collection = os_collection

def get_storage_driver_args(self, storageNames):
names = []
output = ''
for name in storageNames:
if name and name not in names:
names.append(name)
output += '"{0} "'.format(name)
return output

def get_driver_inv(self):
"""Collect device and driver data."""
kernel_version = ""
Expand DownExpand Up@@ -467,6 +480,15 @@ def get_driver_inv(self):
QueryType.DRIVER, "suse-storageversions.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT,
QueryType.DRIVER, "suse-storagedev.sh")
elif self.os_type == OsType.REDHAT and "coreos" in os_name.lower():
drivers = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdriver.sh")
versions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetversions.sh")
descriptions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdev.sh")
drivers += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedriver.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedev.sh")
storagenames = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevnames.sh")
storagenameasargs = self.get_storage_driver_args(storagenames)
versions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevversion.sh " + storagenameasargs)
else:
drivers = self.invoke_shell(
ExecType.SCRIPT, QueryType.DRIVER, "netdriver.sh")
Expand Down
Empty file modifiedos-discovery-tool/netdev.sh
100644 → 100755
Empty file.
Empty file modifiedos-discovery-tool/netdriver.sh
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcos-os-name.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
cat /etc/redhat-release | awk '{print $1" "$2" "$3" "$4" "$5" "$7}'
25 changes: 25 additions & 0 deletions os-discovery-tool/rhcosdockernetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
enicdrivername="enic"
for pciaddress in $(${lshwcmd} -C Network 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
drivername=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}'`
if [[ $drivername == *"$enicdrivername"* ]]
then
kernalversion=`uname -r`
echo ${kernalversion%.*}
else
versionstring=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | \
awk -F":" '{print $2}' | xargs ${modinfocmd} 2>/dev/null | grep ^version: | head -n1 | awk '{print $2}' | xargs`
if [ -z "${versionstring}" ]
then
echo `${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}' | \
xargs ${modinfocmd} 2>/dev/null | grep ^vermagic: | awk '{print $2}'`
else
echo ${versionstring}
fi
fi
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdriver.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/rhcosdockernetversions.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedevnames.sh
7 changes: 7 additions & 0 deletions os-discovery-tool/rhcosstoragedevversion.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
modinfocmd=`which modinfo`
for var in "$@"
do
${modinfocmd} ${var} 2>/dev/null| grep -i "version" | head -n1 | awk '{print $2}'
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedriver.sh
Empty file modifiedos-discovery-tool/storagedev.sh
100644 → 100755
Empty file.
9 changes: 9 additions & 0 deletions os-discovery-tool/storagedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
for pciaddress in $(${lshwcmd} -C Storage 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
${lspcicmd} -v -s ${pciaddress} | grep "Kernel driver" | awk -F":" '{print $2}' | xargs;
done
Empty file modifiedos-discovery-tool/storagedriver.sh
100644 → 100755
Empty file.
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ISPLAT-13588: RedHat CoreOS POC - Initial commit by parthibann · Pull Request #53 · CiscoDevNet/intersight-python-utils · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions os-discovery-tool/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
FROM ubuntu

# Install necessary packages
RUN apt-get update && \
apt-get update --fix-missing && \
apt-get install -y lshw kmod hwinfo pciutils && \
apt-get clean

# Create a volume for the code
VOLUME /app

# Copy the HCL Scripts to collect driver information
COPY ./netdriver.sh /app/
COPY ./rhcosdockernetversions.sh /app/
COPY ./netdev.sh /app/
COPY ./storagedriver.sh /app/
COPY ./storagedev.sh /app/
COPY ./storagedevnames.sh /app/

# Set the working directory
WORKDIR /app
26 changes: 24 additions & 2 deletions os-discovery-tool/get_linux_inv_to_intersight.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class OsType:
"""This class broadly identifies OS categories."""
SUSE = ["Suse", "Sles"]
DEBIAN = ["Ubuntu"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky", "Rhcos"]
ORACLE = ["ol"]


Expand DownExpand Up@@ -372,6 +372,9 @@ def get_os_inv(self):
elif os_vendor == "Rocky":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rocky-os-name.sh")
elif os_vendor == "Rhcos":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rhcos-os-name.sh")
else:
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "redhat-os-name.sh")
Expand All@@ -389,8 +392,9 @@ def get_os_inv(self):
ExecType.SCRIPT,
QueryType.OS,
"centos-os-name-legacy.sh")
self.os_name = os_name

if os_vendor == "Rhel":
if os_vendor in ["Rhel", "Rhcos"]:
os_vendor = "Red Hat"
elif os_vendor == "Centos":
os_vendor = "CentOS"
Expand DownExpand Up@@ -424,6 +428,15 @@ def __init__(self, hostname, os_type, host_type, os_collection):
self.host_type = host_type
self.os_collection = os_collection

def get_storage_driver_args(self, storageNames):
names = []
output = ''
for name in storageNames:
if name and name not in names:
names.append(name)
output += '"{0} "'.format(name)
return output

def get_driver_inv(self):
"""Collect device and driver data."""
kernel_version = ""
Expand DownExpand Up@@ -467,6 +480,15 @@ def get_driver_inv(self):
QueryType.DRIVER, "suse-storageversions.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT,
QueryType.DRIVER, "suse-storagedev.sh")
elif self.os_type == OsType.REDHAT and "coreos" in os_name.lower():
drivers = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdriver.sh")
versions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetversions.sh")
descriptions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdev.sh")
drivers += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedriver.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedev.sh")
storagenames = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevnames.sh")
storagenameasargs = self.get_storage_driver_args(storagenames)
versions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevversion.sh " + storagenameasargs)
else:
drivers = self.invoke_shell(
ExecType.SCRIPT, QueryType.DRIVER, "netdriver.sh")
Expand Down
Empty file modifiedos-discovery-tool/netdev.sh
100644 → 100755
Empty file.
Empty file modifiedos-discovery-tool/netdriver.sh
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcos-os-name.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
cat /etc/redhat-release | awk '{print $1" "$2" "$3" "$4" "$5" "$7}'
25 changes: 25 additions & 0 deletions os-discovery-tool/rhcosdockernetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
enicdrivername="enic"
for pciaddress in $(${lshwcmd} -C Network 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
drivername=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}'`
if [[ $drivername == *"$enicdrivername"* ]]
then
kernalversion=`uname -r`
echo ${kernalversion%.*}
else
versionstring=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | \
awk -F":" '{print $2}' | xargs ${modinfocmd} 2>/dev/null | grep ^version: | head -n1 | awk '{print $2}' | xargs`
if [ -z "${versionstring}" ]
then
echo `${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}' | \
xargs ${modinfocmd} 2>/dev/null | grep ^vermagic: | awk '{print $2}'`
else
echo ${versionstring}
fi
fi
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdriver.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/rhcosdockernetversions.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedevnames.sh
7 changes: 7 additions & 0 deletions os-discovery-tool/rhcosstoragedevversion.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
modinfocmd=`which modinfo`
for var in "$@"
do
${modinfocmd} ${var} 2>/dev/null| grep -i "version" | head -n1 | awk '{print $2}'
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedriver.sh
Empty file modifiedos-discovery-tool/storagedev.sh
100644 → 100755
Empty file.
9 changes: 9 additions & 0 deletions os-discovery-tool/storagedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
for pciaddress in $(${lshwcmd} -C Storage 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
${lspcicmd} -v -s ${pciaddress} | grep "Kernel driver" | awk -F":" '{print $2}' | xargs;
done
Empty file modifiedos-discovery-tool/storagedriver.sh
100644 → 100755
Empty file.
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ISPLAT-13588: RedHat CoreOS POC - Initial commit by parthibann · Pull Request #53 · CiscoDevNet/intersight-python-utils · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions os-discovery-tool/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
FROM ubuntu

# Install necessary packages
RUN apt-get update && \
apt-get update --fix-missing && \
apt-get install -y lshw kmod hwinfo pciutils && \
apt-get clean

# Create a volume for the code
VOLUME /app

# Copy the HCL Scripts to collect driver information
COPY ./netdriver.sh /app/
COPY ./rhcosdockernetversions.sh /app/
COPY ./netdev.sh /app/
COPY ./storagedriver.sh /app/
COPY ./storagedev.sh /app/
COPY ./storagedevnames.sh /app/

# Set the working directory
WORKDIR /app
26 changes: 24 additions & 2 deletions os-discovery-tool/get_linux_inv_to_intersight.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class OsType:
"""This class broadly identifies OS categories."""
SUSE = ["Suse", "Sles"]
DEBIAN = ["Ubuntu"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky", "Rhcos"]
ORACLE = ["ol"]


Expand DownExpand Up@@ -372,6 +372,9 @@ def get_os_inv(self):
elif os_vendor == "Rocky":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rocky-os-name.sh")
elif os_vendor == "Rhcos":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rhcos-os-name.sh")
else:
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "redhat-os-name.sh")
Expand All@@ -389,8 +392,9 @@ def get_os_inv(self):
ExecType.SCRIPT,
QueryType.OS,
"centos-os-name-legacy.sh")
self.os_name = os_name

if os_vendor == "Rhel":
if os_vendor in ["Rhel", "Rhcos"]:
os_vendor = "Red Hat"
elif os_vendor == "Centos":
os_vendor = "CentOS"
Expand DownExpand Up@@ -424,6 +428,15 @@ def __init__(self, hostname, os_type, host_type, os_collection):
self.host_type = host_type
self.os_collection = os_collection

def get_storage_driver_args(self, storageNames):
names = []
output = ''
for name in storageNames:
if name and name not in names:
names.append(name)
output += '"{0} "'.format(name)
return output

def get_driver_inv(self):
"""Collect device and driver data."""
kernel_version = ""
Expand DownExpand Up@@ -467,6 +480,15 @@ def get_driver_inv(self):
QueryType.DRIVER, "suse-storageversions.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT,
QueryType.DRIVER, "suse-storagedev.sh")
elif self.os_type == OsType.REDHAT and "coreos" in os_name.lower():
drivers = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdriver.sh")
versions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetversions.sh")
descriptions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdev.sh")
drivers += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedriver.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedev.sh")
storagenames = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevnames.sh")
storagenameasargs = self.get_storage_driver_args(storagenames)
versions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevversion.sh " + storagenameasargs)
else:
drivers = self.invoke_shell(
ExecType.SCRIPT, QueryType.DRIVER, "netdriver.sh")
Expand Down
Empty file modifiedos-discovery-tool/netdev.sh
100644 → 100755
Empty file.
Empty file modifiedos-discovery-tool/netdriver.sh
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcos-os-name.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
cat /etc/redhat-release | awk '{print $1" "$2" "$3" "$4" "$5" "$7}'
25 changes: 25 additions & 0 deletions os-discovery-tool/rhcosdockernetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
enicdrivername="enic"
for pciaddress in $(${lshwcmd} -C Network 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
drivername=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}'`
if [[ $drivername == *"$enicdrivername"* ]]
then
kernalversion=`uname -r`
echo ${kernalversion%.*}
else
versionstring=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | \
awk -F":" '{print $2}' | xargs ${modinfocmd} 2>/dev/null | grep ^version: | head -n1 | awk '{print $2}' | xargs`
if [ -z "${versionstring}" ]
then
echo `${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}' | \
xargs ${modinfocmd} 2>/dev/null | grep ^vermagic: | awk '{print $2}'`
else
echo ${versionstring}
fi
fi
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdriver.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/rhcosdockernetversions.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedevnames.sh
7 changes: 7 additions & 0 deletions os-discovery-tool/rhcosstoragedevversion.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
modinfocmd=`which modinfo`
for var in "$@"
do
${modinfocmd} ${var} 2>/dev/null| grep -i "version" | head -n1 | awk '{print $2}'
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedriver.sh
Empty file modifiedos-discovery-tool/storagedev.sh
100644 → 100755
Empty file.
9 changes: 9 additions & 0 deletions os-discovery-tool/storagedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
for pciaddress in $(${lshwcmd} -C Storage 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
${lspcicmd} -v -s ${pciaddress} | grep "Kernel driver" | awk -F":" '{print $2}' | xargs;
done
Empty file modifiedos-discovery-tool/storagedriver.sh
100644 → 100755
Empty file.
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' ISPLAT-13588: RedHat CoreOS POC - Initial commit by parthibann · Pull Request #53 · CiscoDevNet/intersight-python-utils · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions os-discovery-tool/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
FROM ubuntu

# Install necessary packages
RUN apt-get update && \
apt-get update --fix-missing && \
apt-get install -y lshw kmod hwinfo pciutils && \
apt-get clean

# Create a volume for the code
VOLUME /app

# Copy the HCL Scripts to collect driver information
COPY ./netdriver.sh /app/
COPY ./rhcosdockernetversions.sh /app/
COPY ./netdev.sh /app/
COPY ./storagedriver.sh /app/
COPY ./storagedev.sh /app/
COPY ./storagedevnames.sh /app/

# Set the working directory
WORKDIR /app
26 changes: 24 additions & 2 deletions os-discovery-tool/get_linux_inv_to_intersight.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class OsType:
"""This class broadly identifies OS categories."""
SUSE = ["Suse", "Sles"]
DEBIAN = ["Ubuntu"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky", "Rhcos"]
ORACLE = ["ol"]


Expand DownExpand Up@@ -372,6 +372,9 @@ def get_os_inv(self):
elif os_vendor == "Rocky":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rocky-os-name.sh")
elif os_vendor == "Rhcos":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rhcos-os-name.sh")
else:
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "redhat-os-name.sh")
Expand All@@ -389,8 +392,9 @@ def get_os_inv(self):
ExecType.SCRIPT,
QueryType.OS,
"centos-os-name-legacy.sh")
self.os_name = os_name

if os_vendor == "Rhel":
if os_vendor in ["Rhel", "Rhcos"]:
os_vendor = "Red Hat"
elif os_vendor == "Centos":
os_vendor = "CentOS"
Expand DownExpand Up@@ -424,6 +428,15 @@ def __init__(self, hostname, os_type, host_type, os_collection):
self.host_type = host_type
self.os_collection = os_collection

def get_storage_driver_args(self, storageNames):
names = []
output = ''
for name in storageNames:
if name and name not in names:
names.append(name)
output += '"{0} "'.format(name)
return output

def get_driver_inv(self):
"""Collect device and driver data."""
kernel_version = ""
Expand DownExpand Up@@ -467,6 +480,15 @@ def get_driver_inv(self):
QueryType.DRIVER, "suse-storageversions.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT,
QueryType.DRIVER, "suse-storagedev.sh")
elif self.os_type == OsType.REDHAT and "coreos" in os_name.lower():
drivers = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdriver.sh")
versions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetversions.sh")
descriptions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdev.sh")
drivers += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedriver.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedev.sh")
storagenames = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevnames.sh")
storagenameasargs = self.get_storage_driver_args(storagenames)
versions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevversion.sh " + storagenameasargs)
else:
drivers = self.invoke_shell(
ExecType.SCRIPT, QueryType.DRIVER, "netdriver.sh")
Expand Down
Empty file modifiedos-discovery-tool/netdev.sh
100644 → 100755
Empty file.
Empty file modifiedos-discovery-tool/netdriver.sh
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcos-os-name.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
cat /etc/redhat-release | awk '{print $1" "$2" "$3" "$4" "$5" "$7}'
25 changes: 25 additions & 0 deletions os-discovery-tool/rhcosdockernetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
enicdrivername="enic"
for pciaddress in $(${lshwcmd} -C Network 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
drivername=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}'`
if [[ $drivername == *"$enicdrivername"* ]]
then
kernalversion=`uname -r`
echo ${kernalversion%.*}
else
versionstring=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | \
awk -F":" '{print $2}' | xargs ${modinfocmd} 2>/dev/null | grep ^version: | head -n1 | awk '{print $2}' | xargs`
if [ -z "${versionstring}" ]
then
echo `${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}' | \
xargs ${modinfocmd} 2>/dev/null | grep ^vermagic: | awk '{print $2}'`
else
echo ${versionstring}
fi
fi
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdriver.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/rhcosdockernetversions.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedevnames.sh
7 changes: 7 additions & 0 deletions os-discovery-tool/rhcosstoragedevversion.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
modinfocmd=`which modinfo`
for var in "$@"
do
${modinfocmd} ${var} 2>/dev/null| grep -i "version" | head -n1 | awk '{print $2}'
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedriver.sh
Empty file modifiedos-discovery-tool/storagedev.sh
100644 → 100755
Empty file.
9 changes: 9 additions & 0 deletions os-discovery-tool/storagedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
for pciaddress in $(${lshwcmd} -C Storage 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
${lspcicmd} -v -s ${pciaddress} | grep "Kernel driver" | awk -F":" '{print $2}' | xargs;
done
Empty file modifiedos-discovery-tool/storagedriver.sh
100644 → 100755
Empty file.
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ISPLAT-13588: RedHat CoreOS POC - Initial commit by parthibann · Pull Request #53 · CiscoDevNet/intersight-python-utils · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions os-discovery-tool/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
FROM ubuntu

# Install necessary packages
RUN apt-get update && \
apt-get update --fix-missing && \
apt-get install -y lshw kmod hwinfo pciutils && \
apt-get clean

# Create a volume for the code
VOLUME /app

# Copy the HCL Scripts to collect driver information
COPY ./netdriver.sh /app/
COPY ./rhcosdockernetversions.sh /app/
COPY ./netdev.sh /app/
COPY ./storagedriver.sh /app/
COPY ./storagedev.sh /app/
COPY ./storagedevnames.sh /app/

# Set the working directory
WORKDIR /app
26 changes: 24 additions & 2 deletions os-discovery-tool/get_linux_inv_to_intersight.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class OsType:
"""This class broadly identifies OS categories."""
SUSE = ["Suse", "Sles"]
DEBIAN = ["Ubuntu"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky", "Rhcos"]
ORACLE = ["ol"]


Expand DownExpand Up@@ -372,6 +372,9 @@ def get_os_inv(self):
elif os_vendor == "Rocky":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rocky-os-name.sh")
elif os_vendor == "Rhcos":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rhcos-os-name.sh")
else:
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "redhat-os-name.sh")
Expand All@@ -389,8 +392,9 @@ def get_os_inv(self):
ExecType.SCRIPT,
QueryType.OS,
"centos-os-name-legacy.sh")
self.os_name = os_name

if os_vendor == "Rhel":
if os_vendor in ["Rhel", "Rhcos"]:
os_vendor = "Red Hat"
elif os_vendor == "Centos":
os_vendor = "CentOS"
Expand DownExpand Up@@ -424,6 +428,15 @@ def __init__(self, hostname, os_type, host_type, os_collection):
self.host_type = host_type
self.os_collection = os_collection

def get_storage_driver_args(self, storageNames):
names = []
output = ''
for name in storageNames:
if name and name not in names:
names.append(name)
output += '"{0} "'.format(name)
return output

def get_driver_inv(self):
"""Collect device and driver data."""
kernel_version = ""
Expand DownExpand Up@@ -467,6 +480,15 @@ def get_driver_inv(self):
QueryType.DRIVER, "suse-storageversions.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT,
QueryType.DRIVER, "suse-storagedev.sh")
elif self.os_type == OsType.REDHAT and "coreos" in os_name.lower():
drivers = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdriver.sh")
versions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetversions.sh")
descriptions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdev.sh")
drivers += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedriver.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedev.sh")
storagenames = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevnames.sh")
storagenameasargs = self.get_storage_driver_args(storagenames)
versions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevversion.sh " + storagenameasargs)
else:
drivers = self.invoke_shell(
ExecType.SCRIPT, QueryType.DRIVER, "netdriver.sh")
Expand Down
Empty file modifiedos-discovery-tool/netdev.sh
100644 → 100755
Empty file.
Empty file modifiedos-discovery-tool/netdriver.sh
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcos-os-name.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
cat /etc/redhat-release | awk '{print $1" "$2" "$3" "$4" "$5" "$7}'
25 changes: 25 additions & 0 deletions os-discovery-tool/rhcosdockernetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
enicdrivername="enic"
for pciaddress in $(${lshwcmd} -C Network 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
drivername=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}'`
if [[ $drivername == *"$enicdrivername"* ]]
then
kernalversion=`uname -r`
echo ${kernalversion%.*}
else
versionstring=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | \
awk -F":" '{print $2}' | xargs ${modinfocmd} 2>/dev/null | grep ^version: | head -n1 | awk '{print $2}' | xargs`
if [ -z "${versionstring}" ]
then
echo `${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}' | \
xargs ${modinfocmd} 2>/dev/null | grep ^vermagic: | awk '{print $2}'`
else
echo ${versionstring}
fi
fi
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdriver.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/rhcosdockernetversions.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedevnames.sh
7 changes: 7 additions & 0 deletions os-discovery-tool/rhcosstoragedevversion.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
modinfocmd=`which modinfo`
for var in "$@"
do
${modinfocmd} ${var} 2>/dev/null| grep -i "version" | head -n1 | awk '{print $2}'
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedriver.sh
Empty file modifiedos-discovery-tool/storagedev.sh
100644 → 100755
Empty file.
9 changes: 9 additions & 0 deletions os-discovery-tool/storagedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
for pciaddress in $(${lshwcmd} -C Storage 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
${lspcicmd} -v -s ${pciaddress} | grep "Kernel driver" | awk -F":" '{print $2}' | xargs;
done
Empty file modifiedos-discovery-tool/storagedriver.sh
100644 → 100755
Empty file.
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ISPLAT-13588: RedHat CoreOS POC - Initial commit by parthibann · Pull Request #53 · CiscoDevNet/intersight-python-utils · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions os-discovery-tool/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
FROM ubuntu

# Install necessary packages
RUN apt-get update && \
apt-get update --fix-missing && \
apt-get install -y lshw kmod hwinfo pciutils && \
apt-get clean

# Create a volume for the code
VOLUME /app

# Copy the HCL Scripts to collect driver information
COPY ./netdriver.sh /app/
COPY ./rhcosdockernetversions.sh /app/
COPY ./netdev.sh /app/
COPY ./storagedriver.sh /app/
COPY ./storagedev.sh /app/
COPY ./storagedevnames.sh /app/

# Set the working directory
WORKDIR /app
26 changes: 24 additions & 2 deletions os-discovery-tool/get_linux_inv_to_intersight.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class OsType:
"""This class broadly identifies OS categories."""
SUSE = ["Suse", "Sles"]
DEBIAN = ["Ubuntu"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky", "Rhcos"]
ORACLE = ["ol"]


Expand DownExpand Up@@ -372,6 +372,9 @@ def get_os_inv(self):
elif os_vendor == "Rocky":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rocky-os-name.sh")
elif os_vendor == "Rhcos":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rhcos-os-name.sh")
else:
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "redhat-os-name.sh")
Expand All@@ -389,8 +392,9 @@ def get_os_inv(self):
ExecType.SCRIPT,
QueryType.OS,
"centos-os-name-legacy.sh")
self.os_name = os_name

if os_vendor == "Rhel":
if os_vendor in ["Rhel", "Rhcos"]:
os_vendor = "Red Hat"
elif os_vendor == "Centos":
os_vendor = "CentOS"
Expand DownExpand Up@@ -424,6 +428,15 @@ def __init__(self, hostname, os_type, host_type, os_collection):
self.host_type = host_type
self.os_collection = os_collection

def get_storage_driver_args(self, storageNames):
names = []
output = ''
for name in storageNames:
if name and name not in names:
names.append(name)
output += '"{0} "'.format(name)
return output

def get_driver_inv(self):
"""Collect device and driver data."""
kernel_version = ""
Expand DownExpand Up@@ -467,6 +480,15 @@ def get_driver_inv(self):
QueryType.DRIVER, "suse-storageversions.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT,
QueryType.DRIVER, "suse-storagedev.sh")
elif self.os_type == OsType.REDHAT and "coreos" in os_name.lower():
drivers = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdriver.sh")
versions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetversions.sh")
descriptions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdev.sh")
drivers += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedriver.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedev.sh")
storagenames = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevnames.sh")
storagenameasargs = self.get_storage_driver_args(storagenames)
versions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevversion.sh " + storagenameasargs)
else:
drivers = self.invoke_shell(
ExecType.SCRIPT, QueryType.DRIVER, "netdriver.sh")
Expand Down
Empty file modifiedos-discovery-tool/netdev.sh
100644 → 100755
Empty file.
Empty file modifiedos-discovery-tool/netdriver.sh
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcos-os-name.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
cat /etc/redhat-release | awk '{print $1" "$2" "$3" "$4" "$5" "$7}'
25 changes: 25 additions & 0 deletions os-discovery-tool/rhcosdockernetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
enicdrivername="enic"
for pciaddress in $(${lshwcmd} -C Network 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
drivername=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}'`
if [[ $drivername == *"$enicdrivername"* ]]
then
kernalversion=`uname -r`
echo ${kernalversion%.*}
else
versionstring=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | \
awk -F":" '{print $2}' | xargs ${modinfocmd} 2>/dev/null | grep ^version: | head -n1 | awk '{print $2}' | xargs`
if [ -z "${versionstring}" ]
then
echo `${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}' | \
xargs ${modinfocmd} 2>/dev/null | grep ^vermagic: | awk '{print $2}'`
else
echo ${versionstring}
fi
fi
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdriver.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/rhcosdockernetversions.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedevnames.sh
7 changes: 7 additions & 0 deletions os-discovery-tool/rhcosstoragedevversion.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
modinfocmd=`which modinfo`
for var in "$@"
do
${modinfocmd} ${var} 2>/dev/null| grep -i "version" | head -n1 | awk '{print $2}'
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedriver.sh
Empty file modifiedos-discovery-tool/storagedev.sh
100644 → 100755
Empty file.
9 changes: 9 additions & 0 deletions os-discovery-tool/storagedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
for pciaddress in $(${lshwcmd} -C Storage 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
${lspcicmd} -v -s ${pciaddress} | grep "Kernel driver" | awk -F":" '{print $2}' | xargs;
done
Empty file modifiedos-discovery-tool/storagedriver.sh
100644 → 100755
Empty file.
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); ISPLAT-13588: RedHat CoreOS POC - Initial commit by parthibann · Pull Request #53 · CiscoDevNet/intersight-python-utils · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions os-discovery-tool/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
FROM ubuntu

# Install necessary packages
RUN apt-get update && \
apt-get update --fix-missing && \
apt-get install -y lshw kmod hwinfo pciutils && \
apt-get clean

# Create a volume for the code
VOLUME /app

# Copy the HCL Scripts to collect driver information
COPY ./netdriver.sh /app/
COPY ./rhcosdockernetversions.sh /app/
COPY ./netdev.sh /app/
COPY ./storagedriver.sh /app/
COPY ./storagedev.sh /app/
COPY ./storagedevnames.sh /app/

# Set the working directory
WORKDIR /app
26 changes: 24 additions & 2 deletions os-discovery-tool/get_linux_inv_to_intersight.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class OsType:
"""This class broadly identifies OS categories."""
SUSE = ["Suse", "Sles"]
DEBIAN = ["Ubuntu"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky"]
REDHAT = ["Red Hat", "Rhel", "Centos", "Rocky", "Rhcos"]
ORACLE = ["ol"]


Expand DownExpand Up@@ -372,6 +372,9 @@ def get_os_inv(self):
elif os_vendor == "Rocky":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rocky-os-name.sh")
elif os_vendor == "Rhcos":
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "rhcos-os-name.sh")
else:
os_name = self.invoke_shell(
ExecType.SCRIPT, QueryType.OS, "redhat-os-name.sh")
Expand All@@ -389,8 +392,9 @@ def get_os_inv(self):
ExecType.SCRIPT,
QueryType.OS,
"centos-os-name-legacy.sh")
self.os_name = os_name

if os_vendor == "Rhel":
if os_vendor in ["Rhel", "Rhcos"]:
os_vendor = "Red Hat"
elif os_vendor == "Centos":
os_vendor = "CentOS"
Expand DownExpand Up@@ -424,6 +428,15 @@ def __init__(self, hostname, os_type, host_type, os_collection):
self.host_type = host_type
self.os_collection = os_collection

def get_storage_driver_args(self, storageNames):
names = []
output = ''
for name in storageNames:
if name and name not in names:
names.append(name)
output += '"{0} "'.format(name)
return output

def get_driver_inv(self):
"""Collect device and driver data."""
kernel_version = ""
Expand DownExpand Up@@ -467,6 +480,15 @@ def get_driver_inv(self):
QueryType.DRIVER, "suse-storageversions.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT,
QueryType.DRIVER, "suse-storagedev.sh")
elif self.os_type == OsType.REDHAT and "coreos" in os_name.lower():
drivers = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdriver.sh")
versions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetversions.sh")
descriptions = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosnetdev.sh")
drivers += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedriver.sh")
descriptions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedev.sh")
storagenames = self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevnames.sh")
storagenameasargs = self.get_storage_driver_args(storagenames)
versions += self.invoke_shell(ExecType.SCRIPT, QueryType.DRIVER, "rhcosstoragedevversion.sh " + storagenameasargs)
else:
drivers = self.invoke_shell(
ExecType.SCRIPT, QueryType.DRIVER, "netdriver.sh")
Expand Down
Empty file modifiedos-discovery-tool/netdev.sh
100644 → 100755
Empty file.
Empty file modifiedos-discovery-tool/netdriver.sh
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcos-os-name.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
cat /etc/redhat-release | awk '{print $1" "$2" "$3" "$4" "$5" "$7}'
25 changes: 25 additions & 0 deletions os-discovery-tool/rhcosdockernetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
enicdrivername="enic"
for pciaddress in $(${lshwcmd} -C Network 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
drivername=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}'`
if [[ $drivername == *"$enicdrivername"* ]]
then
kernalversion=`uname -r`
echo ${kernalversion%.*}
else
versionstring=`${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | \
awk -F":" '{print $2}' | xargs ${modinfocmd} 2>/dev/null | grep ^version: | head -n1 | awk '{print $2}' | xargs`
if [ -z "${versionstring}" ]
then
echo `${lspcicmd} -v -s $pciaddress | grep "Kernel driver" | awk -F":" '{print $2}' | \
xargs ${modinfocmd} 2>/dev/null | grep ^vermagic: | awk '{print $2}'`
else
echo ${versionstring}
fi
fi
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetdriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/netdriver.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosnetversions.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/rhcosdockernetversions.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedev.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedev.sh
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedevnames.sh
7 changes: 7 additions & 0 deletions os-discovery-tool/rhcosstoragedevversion.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
modinfocmd=`which modinfo`
for var in "$@"
do
${modinfocmd} ${var} 2>/dev/null| grep -i "version" | head -n1 | awk '{print $2}'
done
2 changes: 2 additions & 0 deletions os-discovery-tool/rhcosstoragedriver.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
#!/bin/bash
podman run --rm --privileged hcltools:v1 /app/storagedriver.sh
Empty file modifiedos-discovery-tool/storagedev.sh
100644 → 100755
Empty file.
9 changes: 9 additions & 0 deletions os-discovery-tool/storagedevnames.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#!/bin/bash
export PATH=$PATH:/sbin:/usr/sbin
lshwcmd=`which lshw`
lspcicmd=`which lspci`
modinfocmd=`which modinfo`
for pciaddress in $(${lshwcmd} -C Storage 2>/dev/null | grep "pci@" | awk -F":" '{print $3":"$4}');
do
${lspcicmd} -v -s ${pciaddress} | grep "Kernel driver" | awk -F":" '{print $2}' | xargs;
done
Empty file modifiedos-discovery-tool/storagedriver.sh
100644 → 100755
Empty file.