Align openstack/cimi mapping for nic, address and network