Separate T6 and (optional) K.2 NIC setup for compliance images. #203
Conversation
luqmana
force-pushed
the
compliance-net-setup
branch
from
be85579 to
75396a4
Compare
There was a problem hiding this comment.
In general I think anything that isn't specifically related to compliance should have any mention of compliance scrubbed out. We ship the NIC configuration stuff in essentially every image, so I think making it an oxide/ prefix on the FMRI, and removing any mention of compliance, would make it easier to understand the scope.
There was a problem hiding this comment.
I think we should just call this net-setup.sh, removing the compliance prefix.
| . /lib/svc/share/smf_include.sh | ||
|
|
||
| if (( $# != 1 )); then | ||
| echo "usage: compliance-net-setup.sh <NIC dev>" >&2 |
There was a problem hiding this comment.
| echo "usage: compliance-net-setup.sh <NIC dev>" >&2 | |
| echo "usage: $0 LINK" >&2 |
| fi | ||
| nicdev=$1 | ||
|
|
||
| fail_not_found=$(svcprop -p 'config/fail_not_found' $SMF_FMRI) |
There was a problem hiding this comment.
| fail_not_found=$(svcprop -p 'config/fail_not_found' $SMF_FMRI) | |
| if [[ -z $SMF_FMRI ]]; then | |
| printf 'ERROR: must run under SMF\n' >&2 | |
| exit 1 | |
| fi | |
| fail_not_found=$(svcprop -p 'config/fail_not_found' "$SMF_FMRI") |
| nics+=( $try ) | ||
| fi | ||
| done | ||
|
|
||
| if (( ${#nics[@]} == 0 )); then | ||
| exit 1 | ||
| if [[ "$fail_not_found" = "true" ]]; then |
There was a problem hiding this comment.
| if [[ "$fail_not_found" = "true" ]]; then | |
| if [[ $fail_not_found == true ]]; then |
| "src": "compliance-net-setup.sh", | ||
| "owner": "root", "group": "bin", "mode": "0755" }, | ||
| { "t": "ensure_file", | ||
| "file": "/lib/svc/manifest/site/compliance-net-setup.xml", |
There was a problem hiding this comment.
| "file": "/lib/svc/manifest/site/compliance-net-setup.xml", | |
| "file": "/lib/svc/manifest/oxide/net-setup.xml", |
| <dependency name='net' grouping='require_any' restart_on='none' | ||
| type='service'> | ||
| <service_fmri value='svc:/site/compliance/net-setup:igb' /> | ||
| <service_fmri value='svc:/site/compliance/net-setup:e1000' /> |
There was a problem hiding this comment.
| <service_fmri value='svc:/site/compliance/net-setup:e1000' /> | |
| <service_fmri value='svc:/site/compliance/net-setup:e1000g' /> |
|
|
||
| <template> | ||
| <common_name> | ||
| <loctext xml:lang='C'>compliance network setup</loctext> |
There was a problem hiding this comment.
| <loctext xml:lang='C'>compliance network setup</loctext> | |
| <loctext xml:lang='C'>sled network setup</loctext> |
| <loctext xml:lang='C'>compliance network setup</loctext> | ||
| </common_name> | ||
| <description> | ||
| <loctext xml:lang='C'>brings network up for compliance testing |
There was a problem hiding this comment.
| <loctext xml:lang='C'>brings network up for compliance testing | |
| <loctext xml:lang='C'>brings up basic sled networking |
There was a problem hiding this comment.
If we're removing the method here, I don't think we need to keep the service around?
This adds a new service
site/compliance/net-setupwhich ensures we have an IPv6 link-local address for the NICs corresponding to each instance of the service. Each instance is named after the corresponding NIC driver (e.g.,e1000g,igb,cxgbe).