Hi all,
I would like to ask you for a code-review for:

7036455 "installadm list -m" should show criteria

Webrev:
https://cr.opensolaris.org/action/browse/caiman/t.dzik/7036455

How it works:

a) It prints for "installadm list -m" similar output like for
"installadm list -m -n svcname"

b) For each service it prints  active manifests + their associated criteria
fist, followed by default manifest (+ plus it's associated criteria marked as Ignored), followed by inactive manifests. In each of that categories order of manifest is not
explicitly set

c) For each manifest criteria are printed in given order. Order is exactly the same like
if you run "installadm list -m -n svcname"

d) For examples of output, please look at "Testing" paragraph.

Testing:
1) I run all unit tests using ./slim_test -c tests.nose and there were no regressions
2) I run pep8 on file which I modified and there were no issues
3) I created 2 x86 virtual machines and I installed my built workspace on one of them and let the second-one for reference. Then I created several services with different manifests using different criteria. Here are the original outputs of installadm list compared to outputs
after my fix:



a) Original:

root@S11:~# installadm list -m

Service Name     Manifest      Status
------------     --------      ------
default-i386     orig_default  Default
default-sparc    orig_default  Default
solaris11-i386   orig_default  Default
solaris11-sparc  orig_default  Default

a) New:

root@S11:~# installadm list -m

Service Name     Manifest      Status    Criteria
------------     --------      ------    --------
default-i386     orig_default  Default   None

default-sparc    orig_default  Default   None

solaris11-i386   orig_default  Default   None

solaris11-sparc  orig_default  Default   None

b) Original:

root@S11:~# installadm list -m -n default-i386

Manifest      Status    Criteria
--------      ------    --------
orig_default  Default   None


b) New:

root@S11:~# installadm list -m -n default-i386

Manifest      Status    Criteria
--------      ------    --------
orig_default  Default   None

c) Original:

root@S11:~# installadm list -m

Service Name     Manifest      Status
------------     --------      ------
default-i386     orig_default  Default
default-sparc    orig_default  Default
solaris11-i386   orig_default  Default
solaris11-sparc  orig_default  Default

c) New:

root@S11:~# installadm list -m

Service Name     Manifest      Status    Criteria
------------     --------      ------    --------
default-i386     orig_default  Default   (Ignored: ipv4       = 192.168.1.2)
(Ignored: mem = 2048 MB - unbounded)

default-sparc    orig_default  Default   None

solaris11-i386   orig_default  Default   None

solaris11-sparc  orig_default  Default   None

d) Original:

root@S11:~# installadm list -m

Service Name     Manifest                    Status
------------     --------                    ------
default-i386     orig_default                Default
default-sparc    orig_default                Default
solaris11-i386   some-new_manifest-2bbbbbbb  Default
solaris11-sparc  orig_default                Default

d) New:

root@S11:~# installadm list -m

Service Name     Manifest                    Status    Criteria
------------     --------                    ------    --------
default-i386 orig_default Default (Ignored: ipv4 = 129.168.1.2) (Ignored: mem = 2048 MB - unbounded)

default-sparc    orig_default                Default   None

solaris11-i386   some-new_manifest-2bbbbbbb  Default   None

                 orig_default                Inactive  None

                 some-new_manifest-1         Inactive  None

solaris11-sparc  orig_default                Default   None

e) Original:

oot@S11:~# installadm list -m

Service Name     Manifest                    Status
------------     --------                    ------
default-i386     orig_default                Default
default-sparc    orig_default                Default
solaris11-i386   orig_default
                 some-new_manifest-1
                 some-new_manifest-2bbbbbbb  Default
solaris11-sparc  orig_default                Default

e) New:

root@S11:~# installadm list -m

Service Name     Manifest                    Status    Criteria
------------     --------                    ------    --------
default-i386 orig_default Default (Ignored: ipv4 = 129.168.1.2) (Ignored: mem = 2048 MB - unbounded)

default-sparc    orig_default                Default   None

                 new_inactive_manifest       Inactive  None

solaris11-i386   orig_default                          arch       = i86pc
mac = AA:BB:CC:DD:EE:FF ipv4 = 10.0.2.100 - 10.0.2.199
                                                       cpu        = i386
                                                       mem        = 1024 MB
network = 10000000000
                                                       platform   = i86pc
zonename = some-zone-name-1

                 some-new_manifest-1                   arch       = sparc
mac = AA:BB:CC:DD:EE:EE
                                                       mem        = 1024 MB

                 some-new_manifest-2bbbbbbb  Default   None

solaris11-sparc  orig_default                Default   None

4) Because I modified function which is also used for printing profiles I checked
that listing of profiles didn't change

Regards,

Tomas D.
_______________________________________________
caiman-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/caiman-discuss

Reply via email to