fix build break in contrail manager
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a36d31a8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a36d31a8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a36d31a8 Branch: refs/heads/regionvpc Commit: a36d31a8ae950265e28a84028b1ebf4b6491b39a Parents: c3993c0 Author: Murali Reddy <[email protected]> Authored: Mon Feb 10 15:00:04 2014 +0530 Committer: Murali Reddy <[email protected]> Committed: Tue Mar 11 19:52:20 2014 +0530 ---------------------------------------------------------------------- engine/schema/src/com/cloud/network/vpc/VpcVO.java | 1 + .../network/contrail/management/ContrailManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a36d31a8/engine/schema/src/com/cloud/network/vpc/VpcVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/vpc/VpcVO.java b/engine/schema/src/com/cloud/network/vpc/VpcVO.java index 8d5df36..74acd16 100644 --- a/engine/schema/src/com/cloud/network/vpc/VpcVO.java +++ b/engine/schema/src/com/cloud/network/vpc/VpcVO.java @@ -191,6 +191,7 @@ public class VpcVO implements Vpc { public void setUuid(String uuid) { this.uuid = uuid; + } @Override public boolean isRegionLevelVpc() { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a36d31a8/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java index 01be7db..bf083fd 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java @@ -281,7 +281,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager for (String svc: services) { serviceProviderMap.put(svc, providerSet); } - vpcOffer = _vpcProvSvc.createVpcOffering(juniperVPCOfferingName, juniperVPCOfferingDisplayText, services, serviceProviderMap, null); + vpcOffer = _vpcProvSvc.createVpcOffering(juniperVPCOfferingName, juniperVPCOfferingDisplayText, services, serviceProviderMap, null, null); ((VpcOfferingVO)vpcOffer).setState(VpcOffering.State.Enabled); long id = vpcOffer.getId(); _vpcOffDao.update(id, (VpcOfferingVO)vpcOffer);
