SHOW:
|
|
- or go back to the newest paste.
| 1 | //FIND - NetworkUsageTask.run(): | |
| 2 | ||
| 3 | Transaction txn = Transaction.open(Transaction.CLOUD_DB); | |
| 4 | try {
| |
| 5 | if ((answer.getBytesReceived() == 0) && (answer.getBytesSent() == 0)) {
| |
| 6 | s_logger.debug("Recieved and Sent bytes are both 0. Not updating user_statistics");
| |
| 7 | continue; | |
| 8 | } | |
| 9 | ||
| 10 | ||
| 11 | //ADD AFTER: | |
| 12 | long routerNetworkID = 0; | |
| 13 | for (Nic routerNic2 : routerNics) {
| |
| 14 | Network network2 = _networkMgr.getNetwork(routerNic2.getNetworkId()); | |
| 15 | if (network2.getTrafficType() == TrafficType.Guest) {
| |
| 16 | routerNetworkID = network2.getId(); | |
| 17 | } | |
| 18 | } | |
| 19 | //END ADDS; | |
| 20 | ||
| 21 | //FIND | |
| 22 | - | |
| 22 | + | |
| 23 | ||
| 24 | //REPLACE IT WITH: | |
| 25 | UserStatisticsVO stats = _statsDao.lock(router.getAccountId(), router.getDataCenterIdToDeployIn(), routerNetworkID, null, router.getId(), router.getType().toString()); | |
| 26 | ||
| 27 | //========================================================================================== | |
| 28 | ||
| 29 | //FIND - NetworkStatsUpdateTask.prepareStop() | |
| 30 | if (answer != null) {
| |
| 31 | if (!answer.getResult()) {
| |
| 32 | s_logger.warn("Error while collecting network stats from router: "+router.getInstanceName()+" from host: "+router.getHostId() + "; details: " + answer.getDetails());
| |
| 33 | continue; | |
| 34 | } | |
| 35 | Transaction txn = Transaction.open(Transaction.CLOUD_DB); | |
| 36 | try {
| |
| 37 | if ((answer.getBytesReceived() == 0) && (answer.getBytesSent() == 0)) {
| |
| 38 | s_logger.debug("Recieved and Sent bytes are both 0. Not updating user_statistics");
| |
| 39 | continue; | |
| 40 | } | |
| 41 | ||
| 42 | //ADD AFTER: | |
| 43 | long routerNetworkID = 0; | |
| 44 | for (Nic routerNic2 : routerNics) {
| |
| 45 | Network network2 = _networkMgr.getNetwork(routerNic2.getNetworkId()); | |
| 46 | if (network2.getTrafficType() == TrafficType.Guest) {
| |
| 47 | routerNetworkID = network2.getId(); | |
| 48 | } | |
| 49 | } | |
| 50 | //END ADDS; | |
| 51 | ||
| 52 | //FIND | |
| 53 | UserStatisticsVO stats = _statsDao.lock(router.getAccountId(), router.getDataCenterIdToDeployIn(), network.getId(), null, router.getId(), router.getType().toString()); | |
| 54 | ||
| 55 | //REPLACE IT WITH: | |
| 56 | UserStatisticsVO stats = _statsDao.lock(router.getAccountId(), router.getDataCenterIdToDeployIn(), routerNetworkID, null, router.getId(), router.getType().toString()); |
