@sudhansu7 could you please either add or update an existing a Marvin test case to verify this change?

Also, this change seems like it would be useful for LTS users. Could you please change the base branch to 4.9?

@jburwell I have modified the base branch to 4.9 . Also added a marvin test to check nic details.

as it been confirmed the the attribute broadcasturi = vlan://743 is only visible as admin and not as user? because the example have it.

@pdion891
The first listNic example is incorrect code. Which has been fixed in this PR. You can use listVirtualMachine command to see the nic response.

As per code there is no restriction on broadcasturi. If broadcasturi is not null then it will part of vm response.
So the ListNic should also behave the same way.

if (details.contains(VMDetails.all) || details.contains(VMDetails.nics)) {
            long nic_id = userVm.getNicId();
            if (nic_id > 0) {
                NicResponse nicResponse = new NicResponse();
                nicResponse.setId(userVm.getNicUuid());
                nicResponse.setIpaddress(userVm.getIpAddress());
                nicResponse.setGateway(userVm.getGateway());
                nicResponse.setNetmask(userVm.getNetmask());
                nicResponse.setNetworkid(userVm.getNetworkUuid());
                nicResponse.setNetworkName(userVm.getNetworkName());
                nicResponse.setMacAddress(userVm.getMacAddress());
                nicResponse.setIp6Address(userVm.getIp6Address());
                nicResponse.setIp6Gateway(userVm.getIp6Gateway());
                nicResponse.setIp6Cidr(userVm.getIp6Cidr());
                if (userVm.getBroadcastUri() != null) {
                    nicResponse.setBroadcastUri(userVm.getBroadcastUri().toString());
                }
                if (userVm.getIsolationUri() != null) {
                    nicResponse.setIsolationUri(userVm.getIsolationUri().toString());
                }
                if (userVm.getTrafficType() != null) {
                    nicResponse.setTrafficType(userVm.getTrafficType().toString());
                }
                if (userVm.getGuestType() != null) {
                    nicResponse.setType(userVm.getGuestType().toString());
                }
                nicResponse.setIsDefault(userVm.isDefaultNic());
                List<NicSecondaryIpVO> secondaryIps = ApiDBUtils.findNicSecondaryIps(userVm.getNicId());
                if (secondaryIps != null) {
                    List<NicSecondaryIpResponse> ipList = new ArrayList<NicSecondaryIpResponse>();
                    for (NicSecondaryIpVO ip : secondaryIps) {
                        NicSecondaryIpResponse ipRes = new NicSecondaryIpResponse();
                        ipRes.setId(ip.getUuid());
                        ipRes.setIpAddr(ip.getIp4Address());
                        ipList.add(ipRes);
                    }
                    nicResponse.setSecondaryIps(ipList);
                }
                nicResponse.setObjectName("nic");
                userVmResponse.addNic(nicResponse);
            }
        }

Have you tested as @jburwell comments, broadcasturi cannot be part of the response for user, only for root-admin. Does this PR make broadcasturi visible to users?

LGTM on the code changes. Make sense to keep listVirtualMachines and listNics in sync for nic response.

@pdion891 removed broadcasturi from api response. Also added marvin test .

Test LGTM based on manual testing of the fix:

Before Fix:

After Fix: Type of NIC is displayed

d82b2278-ca19-46da-b532-0a044e778bb8
71424164-015c-4163-9dde-74019fb22ce2
255.255.255.0
10.1.1.1
10.1.1.119
Guest
Isolated
true
02:00:1c:fe:00:01
0
71a0be44-69e4-4821-b8d9-e579ed04d52a

ACS CI BVT Run

Sumarry:
Build Number 564
Hypervisor xenserver
NetworkType Advanced
Passed=111
Failed=8
Skipped=6

Link to logs Folder (search by build_no): https://www.dropbox.com/sh/yj3wnzbceo9uef2/AAB6u-Iap-xztdm6jHX9SjPja?dl=0

Failed tests:

• test_deploy_virtio_scsi_vm.py

• test_01_verify_libvirt Failed

• test_02_verify_libvirt_after_restart Failed

• test_03_verify_libvirt_attach_disk Failed

• test_04_verify_guest_lspci Failed

• test_05_change_vm_ostype_restart Failed

• test_06_verify_guest_lspci_again Failed

• ContextSuite context=TestDeployVirtioSCSIVM>:teardown Failed

• test_routers_network_ops.py

• test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true Failing since 2 runs

Skipped tests:
test_vm_nic_adapter_vmxnet3
test_static_role_account_acls
test_11_ss_nfs_version_on_ssvm
test_nested_virtualization_vmware
test_3d_gpu_support
test_deploy_vgpu_enabled_vm

Passed test suits:
test_deploy_vm_with_userdata.py
test_affinity_groups_projects.py
test_portable_publicip.py
test_vm_snapshots.py
test_over_provisioning.py
test_global_settings.py
test_scale_vm.py
test_service_offerings.py
test_routers_iptables_default_policy.py
test_loadbalance.py
test_routers.py
test_reset_vm_on_reboot.py
test_deploy_vms_with_varied_deploymentplanners.py
test_network.py
test_router_dns.py
test_non_contigiousvlan.py
test_login.py
test_deploy_vm_iso.py
test_list_ids_parameter.py
test_public_ip_range.py
test_multipleips_per_nic.py
test_metrics_api.py
test_regions.py
test_affinity_groups.py
test_network_acl.py
test_pvlan.py
test_volumes.py
test_nic.py
test_deploy_vm_root_resize.py
test_resource_detail.py
test_secondary_storage.py
test_vm_life_cycle.py
test_disk_offerings.py

tag:mergeready

failures in BVT are not related to this PR. merging.