R5.0 - ServerManager - image add fails on SMLite

[Sudheendra Rao]

add image command of SMLite fails on mainline build58 ocata with the following error message:

root@nodea10:~# server-manager add image -f image.json

{
    "return_code": 8,
    "return_data": null,
    "return_msg": "Invalid role in image json: iscsid"
}

nothing much in debug log:

"2017-12-11 22:35:14,584-DEBUG-server_mgr_main.py:5412-find_package_sku(): version of nova-api : 2:15.0.6-0ubuntu1~cloud0.1contrail
"
"2017-12-11 22:35:14,584-ERROR-server_mgr_main.py:1900-validate_container_image(): Invalid role in image json: iscsid"

content of image.json:
{
    "image": [
        {
            "category": "package",
            "path": "/root/contrail-cloud-docker_5.0.0-58-ocata_xenial.tgz",
            "version": "58",
            "type": "contrail-ubuntu-package",
            "id": "ubuntu16ocata58"
        }
    ]
}

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/38261
Submitter: Dheeraj Gautam (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/38261
Committed: http://github.com/Juniper/contrail-server-manager/commit/6b93da1c738568ec3795b1240df410a354951cde
Submitter: Zuul (<email address hidden>)
Branch: master

commit 6b93da1c738568ec3795b1240df410a354951cde
Author: Dheeraj Gautam <email address hidden>
Date: Mon Dec 11 16:45:59 2017 -0800

add ironic related containers to SM validation for add image

Change-Id: I1bb2b38b4e68ca81ccdd061d0d11453c09091bed
Closes-Bug: #1737593

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/38323
Submitter: Dheeraj Gautam (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/38323
Committed: http://github.com/Juniper/contrail-server-manager/commit/9f132d7bc53f8cacdcd76533afea8d3dd6a31bab
Submitter: Zuul (<email address hidden>)
Branch: master

commit 9f132d7bc53f8cacdcd76533afea8d3dd6a31bab
Author: Dheeraj Gautam <email address hidden>
Date: Wed Dec 13 17:27:42 2017 -0800

add iscsid and dnsmasq as well to container validations

Change-Id: Ic6ec1e59fbf355267b1a15bb71d39dbaf7235546
Closes-Bug: #1737593

[Ritam Gangopadhyay (ritam)]

Sanities on mainline are failing due to this. This commit (https://github.com/Juniper/contrail-server-manager/commit/9f132d7bc53f8cacdcd76533afea8d3dd6a31bab ) that went in a day ago causes image add to fail with the below error:-

root@nodea10:~# server-manager add image -f /var/log/contrail/sm_provisioning/2017_12_15__07_51_11/image.json

{
    "return_code": 8,
    "return_data": null,
    "return_msg": "Invalid role in image json: rabbitmq"
}
root@nodea10:~#

debug.log:-
"2017-12-15 09:09:28,343-ERROR-server_mgr_main.py:1900-validate_container_image(): Invalid role in image json: rabbitmq"

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/38368
Submitter: Dheeraj Gautam (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/38368
Committed: http://github.com/Juniper/contrail-server-manager/commit/d4ce38ba234619a6b908c5942150fb5e2ecee0da
Submitter: Zuul (<email address hidden>)
Branch: master

commit d4ce38ba234619a6b908c5942150fb5e2ecee0da
Author: Dheeraj Gautam <email address hidden>
Date: Thu Dec 14 21:03:49 2017 -0800

add comma b/w two names of containers.

Change-Id: I165a9ce00928bb15c1ab83898f2a28aa9c635730
Closes-Bug: #1737593