VPC and Virtual Network Managers refactor. Part of the VPC Redundant Router work

api/src/org/apache/cloudstack/api/ApiConstants.java

@@ -268,6 +268,7 @@ public class ApiConstants {
     public static final String VIRTUAL_MACHINE_ID = "virtualmachineid";
     public static final String VIRTUAL_MACHINE_IDS = "virtualmachineids";
     public static final String VIRTUAL_MACHINE_ID_IP = "vmidipmap";
+    public static final String USAGE_ID = "usageid";
 
     public static final String VLAN = "vlan";
     public static final String VLAN_RANGE = "vlanrange";

api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java

@@ -73,6 +73,9 @@ public class GetUsageRecordsCmd extends BaseListCmd {
     @Parameter(name = ApiConstants.TYPE, type = CommandType.LONG, description = "List usage records for the specified usage type")
     private Long usageType;
 
+    @Parameter(name = ApiConstants.USAGE_ID, type = CommandType.STRING, description = "List usage records for the specified usage UUID. Can be used only together with TYPE parameter.")
+    private String usageId;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -105,6 +108,10 @@ public Long getProjectId() {
         return projectId;
     }
 
+    public String getUsageId() {
+        return usageId;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -1843,7 +1843,7 @@ protected void migrate(VMInstanceVO vm, long srcHostId, DeployDestination dest)
             vmSrc.addNic(nic);
         }
 
-        VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
+        VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, _offeringDao.findById(vm.getId(), vm.getServiceOfferingId()), null, null);
         _networkMgr.prepareNicForMigration(profile, dest);
         volumeMgr.prepareForMigration(profile, dest);
 

plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java

@@ -516,7 +516,7 @@ public final Answer executeRequest(final Command cmd) {
             // Only Answer instances are returned by remote agents.
             // E.g. see Response.getAnswers()
             Answer[] result = s_gson.fromJson(ansStr, Answer[].class);
-            String logResult = cleanPassword(StringEscapeUtils.unescapeJava(result.toString()));
+            String logResult = cleanPassword(s_gson.toJson(result));
             s_logger.debug("executeRequest received response " + logResult);
             if (result.length > 0) {
                 return result[0];
@@ -547,7 +547,7 @@ private Answer execute(CopyCommand cmd) {
         }
 
         Answer[] result = s_gson.fromJson(ansStr, Answer[].class);
-        String logResult = cleanPassword(StringEscapeUtils.unescapeJava(result.toString()));
+        String logResult = cleanPassword(s_gson.toJson(result));
         s_logger.debug("executeRequest received response " + logResult);
         if (result.length > 0) {
             return result[0];

plugins/network-elements/dns-notifier/resources/components-example.xml

@@ -25,7 +25,6 @@ under the License.
         <checker name="ManagementServerNode" class="com.cloud.cluster.ManagementServerNode"/>
         <checker name="EncryptionSecretKeyChecker" class="com.cloud.utils.crypt.EncryptionSecretKeyChecker"/>
         <checker name="DatabaseIntegrityChecker" class="com.cloud.upgrade.DatabaseIntegrityChecker"/>
-        <checker name="DatabaseUpgradeChecker" class="com.cloud.upgrade.PremiumDatabaseUpgradeChecker"/>
     </system-integrity-checker>
 
     <interceptor library="com.cloud.configuration.DefaultInterceptorLibrary"/>