added network, changed celiometer to monitoruy for node feature
conflict fix