‘No shortage of water in city from next summer’