cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject [1/4] git commit: updated refs/heads/master to 4456745
Date Wed, 03 Apr 2013 10:14:43 GMT
Updated Branches:
  refs/heads/master 213c16301 -> 44567453e


Rename MidoNetElement and MidoNetGuestNetworkGuru

- Creating this as a separate commit so that it is marked as a rename
- Over 50% code changed, so would count as a delete and add otherwise

Signed-off-by: Dave Cahill <dcahill@midokura.com>
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d392445f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d392445f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d392445f

Branch: refs/heads/master
Commit: d392445f7e9adab7d6effd4daf0d76bb0e6f9bd9
Parents: 213c163
Author: Dave Cahill <dcahill@midokura.com>
Authored: Wed Mar 13 17:27:09 2013 +0900
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Wed Apr 3 12:03:05 2013 +0200

----------------------------------------------------------------------
 .../network/element/MidokuraMidonetElement.java    |  131 ---------------
 .../guru/MidokuraMidonetGuestNetworkGuru.java      |   48 ------
 .../com/cloud/network/element/MidoNetElement.java  |  131 +++++++++++++++
 .../network/guru/MidoNetGuestNetworkGuru.java      |   48 ++++++
 4 files changed, 179 insertions(+), 179 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d392445f/plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java
b/plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java
deleted file mode 100644
index 48833b3..0000000
--- a/plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package com.cloud.network.element;
-
-import com.cloud.deploy.DeployDestination;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.Network;
-import com.cloud.network.Network.Capability;
-import com.cloud.network.Network.Provider;
-import com.cloud.network.Network.Service;
-import com.cloud.network.PhysicalNetworkServiceProvider;
-import com.cloud.offering.NetworkOffering;
-import com.cloud.utils.component.AdapterBase;
-import com.cloud.utils.component.PluggableService;
-import com.cloud.vm.NicProfile;
-import com.cloud.vm.ReservationContext;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachineProfile;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
-import javax.ejb.Local;
-import java.lang.Class;
-import java.util.Map;
-import java.util.Set;
-
-
-@Component
-@Local(value = NetworkElement.class)
-public class MidokuraMidonetElement extends AdapterBase implements ConnectivityProvider,
PluggableService {
-    private static final Logger s_logger = Logger.getLogger(MidokuraMidonetElement.class);
-
-    @Override
-    public Map<Service, Map<Capability, String>> getCapabilities() {
-        // TODO: implement this.
-        return null;
-    }
-
-    @Override
-    public Provider getProvider() {
-        // TODO: implement this.
-        return null;
-    }
-
-    @Override
-    public boolean implement(Network network, NetworkOffering offering, DeployDestination
dest,
-                             ReservationContext context)
-            throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException
{
-        // TODO: implement this.
-        return false;
-    }
-
-    @Override
-    public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile<? extends
VirtualMachine> vm,
-                           DeployDestination dest, ReservationContext context)
-            throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException
{
-        // TODO: implement this.
-        return false;
-    }
-
-    @Override
-    public boolean release(Network network, NicProfile nic, VirtualMachineProfile<? extends
VirtualMachine> vm,
-                           ReservationContext context)
-            throws ConcurrentOperationException, ResourceUnavailableException {
-        // TODO: implement this.
-        return false;
-    }
-
-    @Override
-    public boolean shutdown(Network network, ReservationContext context, boolean cleanup)
-            throws ConcurrentOperationException, ResourceUnavailableException {
-        // TODO: implement this.
-        return false;
-    }
-
-    @Override
-    public boolean destroy(Network network) throws ConcurrentOperationException, ResourceUnavailableException
{
-        // TODO: implement this.
-        return false;
-    }
-
-    @Override
-    public boolean isReady(PhysicalNetworkServiceProvider provider) {
-        // TODO: implement this.
-        return false;
-    }
-
-    @Override
-    public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext
context)
-            throws ConcurrentOperationException, ResourceUnavailableException {
-        // TODO: implement this.
-        return false;
-    }
-
-    @Override
-    public boolean canEnableIndividualServices() {
-        // TODO: implement this.
-        return false;
-    }
-
-    @Override
-    public boolean verifyServicesCombination(Set<Service> services) {
-        // TODO: implement this.
-        return false;
-    }
-
-    @Override
-    public List<Class<?>> getCommands() {
-        // TODO: implement this.
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d392445f/plugins/network-elements/midokura-midonet/src/com/cloud/network/guru/MidokuraMidonetGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/midokura-midonet/src/com/cloud/network/guru/MidokuraMidonetGuestNetworkGuru.java
b/plugins/network-elements/midokura-midonet/src/com/cloud/network/guru/MidokuraMidonetGuestNetworkGuru.java
deleted file mode 100644
index ed0eb3c..0000000
--- a/plugins/network-elements/midokura-midonet/src/com/cloud/network/guru/MidokuraMidonetGuestNetworkGuru.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package com.cloud.network.guru;
-
-import com.cloud.dc.DataCenter.NetworkType;
-import com.cloud.network.PhysicalNetwork;
-import com.cloud.offering.NetworkOffering;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
-import javax.ejb.Local;
-
-/**
- * User: tomoe
- * Date: 8/8/12
- * Time: 10:46 AM
- */
-
-@Component
-@Local(value = NetworkGuru.class)
-public class MidokuraMidonetGuestNetworkGuru extends GuestNetworkGuru {
-    private static final Logger s_logger = Logger.getLogger(MidokuraMidonetGuestNetworkGuru.class);
-
-
-    @Override
-    protected boolean canHandle(NetworkOffering offering, NetworkType networkType,
-                                PhysicalNetwork physicalNetwork) {
-        // TODO: implement this.
-        return false;
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d392445f/plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java
b/plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java
new file mode 100644
index 0000000..48833b3
--- /dev/null
+++ b/plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java
@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.cloud.network.element;
+
+import com.cloud.deploy.DeployDestination;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.Network;
+import com.cloud.network.Network.Capability;
+import com.cloud.network.Network.Provider;
+import com.cloud.network.Network.Service;
+import com.cloud.network.PhysicalNetworkServiceProvider;
+import com.cloud.offering.NetworkOffering;
+import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.component.PluggableService;
+import com.cloud.vm.NicProfile;
+import com.cloud.vm.ReservationContext;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachineProfile;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import javax.ejb.Local;
+import java.lang.Class;
+import java.util.Map;
+import java.util.Set;
+
+
+@Component
+@Local(value = NetworkElement.class)
+public class MidokuraMidonetElement extends AdapterBase implements ConnectivityProvider,
PluggableService {
+    private static final Logger s_logger = Logger.getLogger(MidokuraMidonetElement.class);
+
+    @Override
+    public Map<Service, Map<Capability, String>> getCapabilities() {
+        // TODO: implement this.
+        return null;
+    }
+
+    @Override
+    public Provider getProvider() {
+        // TODO: implement this.
+        return null;
+    }
+
+    @Override
+    public boolean implement(Network network, NetworkOffering offering, DeployDestination
dest,
+                             ReservationContext context)
+            throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException
{
+        // TODO: implement this.
+        return false;
+    }
+
+    @Override
+    public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile<? extends
VirtualMachine> vm,
+                           DeployDestination dest, ReservationContext context)
+            throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException
{
+        // TODO: implement this.
+        return false;
+    }
+
+    @Override
+    public boolean release(Network network, NicProfile nic, VirtualMachineProfile<? extends
VirtualMachine> vm,
+                           ReservationContext context)
+            throws ConcurrentOperationException, ResourceUnavailableException {
+        // TODO: implement this.
+        return false;
+    }
+
+    @Override
+    public boolean shutdown(Network network, ReservationContext context, boolean cleanup)
+            throws ConcurrentOperationException, ResourceUnavailableException {
+        // TODO: implement this.
+        return false;
+    }
+
+    @Override
+    public boolean destroy(Network network) throws ConcurrentOperationException, ResourceUnavailableException
{
+        // TODO: implement this.
+        return false;
+    }
+
+    @Override
+    public boolean isReady(PhysicalNetworkServiceProvider provider) {
+        // TODO: implement this.
+        return false;
+    }
+
+    @Override
+    public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext
context)
+            throws ConcurrentOperationException, ResourceUnavailableException {
+        // TODO: implement this.
+        return false;
+    }
+
+    @Override
+    public boolean canEnableIndividualServices() {
+        // TODO: implement this.
+        return false;
+    }
+
+    @Override
+    public boolean verifyServicesCombination(Set<Service> services) {
+        // TODO: implement this.
+        return false;
+    }
+
+    @Override
+    public List<Class<?>> getCommands() {
+        // TODO: implement this.
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d392445f/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java
b/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java
new file mode 100644
index 0000000..ed0eb3c
--- /dev/null
+++ b/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.cloud.network.guru;
+
+import com.cloud.dc.DataCenter.NetworkType;
+import com.cloud.network.PhysicalNetwork;
+import com.cloud.offering.NetworkOffering;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import javax.ejb.Local;
+
+/**
+ * User: tomoe
+ * Date: 8/8/12
+ * Time: 10:46 AM
+ */
+
+@Component
+@Local(value = NetworkGuru.class)
+public class MidokuraMidonetGuestNetworkGuru extends GuestNetworkGuru {
+    private static final Logger s_logger = Logger.getLogger(MidokuraMidonetGuestNetworkGuru.class);
+
+
+    @Override
+    protected boolean canHandle(NetworkOffering offering, NetworkType networkType,
+                                PhysicalNetwork physicalNetwork) {
+        // TODO: implement this.
+        return false;
+    }
+}
\ No newline at end of file


Mime
View raw message