Merge "Bug 3424 use MAC from external node connector"
authorKeith Burns <alagalah@gmail.com>
Wed, 16 Dec 2015 23:51:41 +0000 (23:51 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 16 Dec 2015 23:51:41 +0000 (23:51 +0000)
52 files changed:
demos/gbpsfc-env/Vagrantfile
demos/gbpsfc-env/bootstrap.sh [changed mode: 0644->0755]
demos/gbpsfc-env/checkdemo.sh [changed mode: 0644->0755]
demos/gbpsfc-env/cleandemo.sh [changed mode: 0644->0755]
demos/gbpsfc-env/demo-asymmetric-chain/get-nsps.py [changed mode: 0644->0755]
demos/gbpsfc-env/demo-asymmetric-chain/infrastructure_config.py [changed mode: 0644->0755]
demos/gbpsfc-env/demo-asymmetric-chain/rest.py [changed mode: 0644->0755]
demos/gbpsfc-env/demo-asymmetric-chain/sf-config.sh [changed mode: 0644->0755]
demos/gbpsfc-env/demo-gbp1/get-nsps.py [changed mode: 0644->0755]
demos/gbpsfc-env/demo-gbp1/infrastructure_config.py [changed mode: 0644->0755]
demos/gbpsfc-env/demo-gbp1/rest.py [changed mode: 0644->0755]
demos/gbpsfc-env/demo-symmetric-chain/get-nsps.py [changed mode: 0644->0755]
demos/gbpsfc-env/demo-symmetric-chain/infrastructure_config.py [changed mode: 0644->0755]
demos/gbpsfc-env/demo-symmetric-chain/rest.py [changed mode: 0644->0755]
demos/gbpsfc-env/demo-symmetric-chain/sf-config.sh [changed mode: 0644->0755]
demos/gbpsfc-env/dpdumpflows.py [changed mode: 0644->0755]
demos/gbpsfc-env/dumpflows.sh [changed mode: 0644->0755]
demos/gbpsfc-env/env.sh [changed mode: 0644->0755]
demos/gbpsfc-env/flowcount.sh [changed mode: 0644->0755]
demos/gbpsfc-env/infrastructure_launch.py [changed mode: 0644->0755]
demos/gbpsfc-env/ovsinstall.sh [changed mode: 0644->0755]
demos/gbpsfc-env/ovswork.sh [changed mode: 0644->0755]
demos/gbpsfc-env/pollflows.sh [changed mode: 0644->0755]
demos/gbpsfc-env/resetcontroller.sh [changed mode: 0644->0755]
demos/gbpsfc-env/rest-clean.py [changed mode: 0644->0755]
demos/gbpsfc-env/sf-config.sh [changed mode: 0644->0755]
demos/gbpsfc-env/startdemo.sh [changed mode: 0644->0755]
demos/gbpsfc-env/traceflow.sh [changed mode: 0644->0755]
demos/gbpsfc-env/utils/setuphosts.sh [changed mode: 0644->0755]
demos/gbpsfc-env/utils/sf-config.sh [changed mode: 0644->0755]
demos/gbpsfc-env/utils/sf-flows.sh [changed mode: 0644->0755]
demos/gbpsfc-env/vmclean.sh [changed mode: 0644->0755]
groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/EpRendererAugmentationRegistryImplModule.java
groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/EpRendererAugmentationRegistryImplModuleFactory.java
groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/GroupbasedpolicyModule.java
groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/GroupbasedpolicyModuleFactory.java
groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/PolicyValidatorRegistryModule.java
groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/PolicyValidatorRegistryModuleFactory.java
neutron-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_mapper/impl/NeutronMapperModuleFactory.java
neutron-ovsdb/src/main/java/org/opendaylight/controller/config/yang/config/neutron_ovsdb/impl/NeutronOvsdbModuleFactory.java
renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderModule.java
renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderModuleFactory.java
renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java
renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModuleFactory.java
renderers/netconf/src/main/java/org/opendaylight/controller/config/yang/config/netconf_provider/impl/NetconfProviderModule.java
renderers/netconf/src/main/java/org/opendaylight/controller/config/yang/config/netconf_provider/impl/NetconfProviderModuleFactory.java
renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModule.java
renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModuleFactory.java
renderers/ovssfc/src/main/java/org/opendaylight/controller/config/yang/config/ovssfc_provider/impl/OvssfcProviderModule.java
renderers/ovssfc/src/main/java/org/opendaylight/controller/config/yang/config/ovssfc_provider/impl/OvssfcProviderModuleFactory.java
ui-backend/src/main/java/org/opendaylight/controller/config/yang/config/ui_backend/impl/UiBackendModule.java
ui-backend/src/main/java/org/opendaylight/controller/config/yang/config/ui_backend/impl/UiBackendModuleFactory.java

index 7eab55114678e7131dbdd12e69b5a2a2e8c41161..c435791c20e57bc5b2474a2e359b8b14d428e556 100644 (file)
@@ -7,9 +7,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provider "virtualbox" do |vb|
     vb.memory = "512"
   end
-  if Vagrant.has_plugin?("vagrant-cachier")
-    config.cache.scope = :box
-  end
   # run our bootstrapping for the system
   config.vm.provision 'shell', path: 'bootstrap.sh', :args => odl
 
@@ -24,6 +21,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       vm_ip = ips[n]
       vm_index = n+1
       compute.vm.box = "ubuntu/trusty64"
+      compute.vm.box_version = "20151130.0.0"
       compute.vm.hostname = "gbpsfc#{vm_index}"
       compute.vm.network "private_network", ip: "#{vm_ip}"
       compute.vm.provider :virtualbox do |vb|
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
index 97b4eb934802f2c7e140c3e957f7e98f921897ac..5e2c93566011288542ee91624f20eda52524c402 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 package org.opendaylight.controller.config.yang.config.groupbasedpolicy;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
index a6545ead42d2a0818c437ac005637c5c314df3bb..3e27189acba6343437aad8e76f42a74bbf205540 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 /*
 * Generated file
 *
index e649597447e03bc79134dd5daa448e7d60afb006..d8bb3b796b959419170d3150fed017bf9ee98357 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 package org.opendaylight.controller.config.yang.config.groupbasedpolicy;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
index ce60f22b07555e85796bb48a56fa5d7536251883..bdb058d21afc74b554e5dbb380c49f53052a8a68 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 /*
 * Generated file
 *
index 57e8abcc00b4cc2512a13dc03a94ab27169cba35..e81f89baa8d3b571f204f5a4f4894bd2af6156fd 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 package org.opendaylight.controller.config.yang.config.groupbasedpolicy;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
index 3b11bd15c5e4849b1e80a983d05d8c4b0388ea19..65b99e445e3e989ea75a994360e0a0470bfd82a8 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 /*
 * Generated file
 *
index e1fc85ef84038cda4c6d6336d265e81df2beadef..d748780f042bde347b680d2e0158dcfcc96d0dd1 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 /*
 * Generated file
 *
@@ -7,13 +15,6 @@
 *
 * Do not modify this file unless it is present under src/main directory
 */
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
 
 package org.opendaylight.controller.config.yang.config.neutron_mapper.impl;
 
index 387ed6b1c2c75ed77300bb3c176268b2a55f0dcc..74ef6862d4f8d1863a261d287a02a8537b8680ba 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 /*
 * Generated file
 *
index c18017efc234fc459a2eaffdd3d00b8294f4eefc..553910055d7fdc9be12435ae001d6c62d18da469 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Huawei Technologies and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 package org.opendaylight.controller.config.yang.config.faas_provider.impl;
 
 import org.opendaylight.groupbasedpolicy.renderer.faas.FaasRenderer;
index 1ad57e669b7ec3ec2d61c1987767f8f2b281f7f6..4f011d567955a24930ebf9a84ef1c40a59670855 100644 (file)
@@ -1,10 +1,18 @@
+/*
+ * Copyright (c) 2015 Huawei Technologies and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 /*
  * Generated file
- * 
+ *
  * Generated from: yang module name: faas-provider-impl yang module local name: faas-provider-impl
  * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
  * Generated at: Fri Oct 09 16:39:53 EDT 2015
- * 
+ *
  * Do not modify this file unless it is present under src/main directory
  */
 package org.opendaylight.controller.config.yang.config.faas_provider.impl;
index c06a951e9a3c97824e30e1154e73d52698458de1..c519846fa4d79a6a8e514b913e66b8ddf0a7c27b 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Inocybe Technologies and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 package org.opendaylight.controller.config.yang.config.iovisor_provider.impl;
 
 import org.opendaylight.groupbasedpolicy.renderer.iovisor.IovisorRenderer;
index 79f18bb51c9c0f15f41a81a65c514897b51e12c8..5588de71f874d0f1c46d607a3aaad9818823a371 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Inocybe Technologies and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 /*
 * Generated file
 *
index 7431bc9239a0241fec029b45abce379452dc0f7d..56a637a041d4b9cf96101dbba0a123247d795c64 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Cisco Systems. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 package org.opendaylight.controller.config.yang.config.netconf_provider.impl;
 public class NetconfProviderModule extends org.opendaylight.controller.config.yang.config.netconf_provider.impl.AbstractNetconfProviderModule {
     public NetconfProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
index e50d50bd0c438e22781b47bfa23b10274babcb08..d9592b2a4f6e2597f9e39bd22db55798f3810ade 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Cisco Systems. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 /*
 * Generated file
 *
index 21d26dca2776f8a89857f0136d6eda8db63e6c6e..b0658db00335627cb4651cd35721951c0eea33da 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 package org.opendaylight.controller.config.yang.config.ofoverlay_provider.impl;
 
 
index f572890b21a340381a4493dcf5ecb5520e81da64..d4683f760c19405239b99a289ca44f7d6f83950d 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 /*
 * Generated file
 *
index db4754e661546b328aee7e3184f9839f7a88a614..a8415be24b9f55719981a95b1e76dc4c0363dce2 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 package org.opendaylight.controller.config.yang.config.ovssfc_provider.impl;
 public class OvssfcProviderModule extends org.opendaylight.controller.config.yang.config.ovssfc_provider.impl.AbstractOvssfcProviderModule {
     public OvssfcProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
index fc50fefde29830d336c1c60578923d33b0e4051e..6a6cd0d7020a77f7e258b9b710b3b8d3cdd43588 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 /*
 * Generated file
 *
index ae82bc87f0fbf074b3ef89d60a6f93226036001d..a9c45960c41012e85601614982e31b5288a154fb 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 package org.opendaylight.controller.config.yang.config.ui_backend.impl;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
index 7bc7f648245af6224a0976f9f3f1a7fa8d7b981c..e9c5ba22afd9f9d5080da13b24bd11fe2e7ba812 100644 (file)
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 /*
 * Generated file
 *