integration/distribution.git
10 years agoimprove -of13 switching in distributions/base (BUG 802)
Michal Rehak [Tue, 22 Apr 2014 13:41:28 +0000 (15:41 +0200)]
improve -of13 switching in distributions/base (BUG 802)

- if of13 is not involved, remove openflowplugin config
- if of13 is involved, create symbolic link to openflowplugin config

Change-Id: I8de221a428a66452aeedbae35352b41932b6ab74
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agofix for BUG 760 (provided configs)
Michal Rehak [Wed, 16 Apr 2014 11:39:25 +0000 (13:39 +0200)]
fix for BUG 760 (provided configs)

- added unpacking of xml from resources to target/provided-configs
- limited to artifactIds: openflowplugin-controller-config
- copied content of target/provided-configs to opendaylight/configuration/initial by assembly-plugin
- changed execution id in pom to match id of execution with the same purpose in distribution/services

Change-Id: Ice4247682ae53576146b8f0f61ebc9599c35b6a8
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoDo not bundle META-INF in configuration
Robert Varga [Fri, 11 Apr 2014 15:20:51 +0000 (17:20 +0200)]
Do not bundle META-INF in configuration

This fixes a packaging issue, where the META-INF directory of
downstream configuration jars would be included in final distribution's
configuration directory -- e.g. we had a useless configuration/META-INF
directory.

Should be included in stable branch, too.

Change-Id: I96ad12589876d2585dab5cd3ddee4e271fbb3231
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoUpdated version of VTN for virt edition.
Hideyuki Tai [Fri, 11 Apr 2014 08:37:53 +0000 (04:37 -0400)]
Updated version of VTN for virt edition.

This patch updated pom.xml of virtualization edition to use new version
of VTN Coordinator.

Change-Id: I35bfe51e8a8639b0d304b2ffb4804d05eca32b3d
Signed-off-by: Hideyuki Tai <h-tai@cd.jp.nec.com>
10 years agoupdated lispflowmapping version, and adding missing dependency
David Goldberg [Sun, 6 Apr 2014 09:53:04 +0000 (12:53 +0300)]
updated lispflowmapping version, and adding missing dependency

Signed-off-by: David Goldberg <david.goldberg@contextream.com>
10 years agoRevert Jenkins changes. Try 1.
Luis Gomez [Wed, 2 Apr 2014 00:51:04 +0000 (17:51 -0700)]
Revert Jenkins changes. Try 1.

Change-Id: I6d04bdccbdaa870740b2cc4af7c7328e68779b04
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
10 years agoUpdate to new version of the artifacts proposed by jenkins-integration-version-changes-20
jenkins-integration [Tue, 1 Apr 2014 16:00:34 +0000 (16:00 +0000)]
Update to new version of the artifacts proposed by jenkins-integration-version-changes-20

Change-Id: Ie2b24f667efdab264abb9f7bb33e1c7bd2d64a41
Signed-off-by: jenkins-integration <jekins-integration@opendaylight.org>
10 years agoUpdate to new version of the artifacts proposed by jenkins-integration-version-changes-18
jenkins-integration [Sun, 23 Mar 2014 00:35:29 +0000 (00:35 +0000)]
Update to new version of the artifacts proposed by jenkins-integration-version-changes-18

Change-Id: Ie4780b6fe1157c8ada3edec3d43f50c9622c65f2
Signed-off-by: jenkins-integration <jekins-integration@opendaylight.org>
10 years agoBump lispflowmapping versions from non-existing 1.1.1-SNAPSHOT to 1.1.2-SNAPSHOT
Tomas Olvecky [Tue, 25 Feb 2014 12:47:09 +0000 (13:47 +0100)]
Bump lispflowmapping versions from non-existing 1.1.1-SNAPSHOT to 1.1.2-SNAPSHOT

Change-Id: Iaf62efe9f8b3f399ee9368987db272c612885d9e
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoMerge "Updated a version of ovsdb for virt edition."
Luis Gomez [Sat, 22 Feb 2014 14:02:42 +0000 (14:02 +0000)]
Merge "Updated a version of ovsdb for virt edition."

10 years agoMerge "Updated versions of ovsdb for base edition."
Luis Gomez [Sat, 22 Feb 2014 14:02:14 +0000 (14:02 +0000)]
Merge "Updated versions of ovsdb for base edition."

10 years agoMerge "Updated the bundle filter list in virt edition."
Luis Gomez [Sat, 22 Feb 2014 14:01:29 +0000 (14:01 +0000)]
Merge "Updated the bundle filter list in virt edition."

10 years agoMerge "Updated versions of vtn bundles for virt edition."
Luis Gomez [Sat, 22 Feb 2014 14:00:57 +0000 (14:00 +0000)]
Merge "Updated versions of vtn bundles for virt edition."

10 years agoUpdated a version of ovsdb for virt edition.
Hideyuki Tai [Fri, 21 Feb 2014 04:39:40 +0000 (23:39 -0500)]
Updated a version of ovsdb for virt edition.

This patch updated pom.xml of virtualization edition to use new version
of ovsdb neutron bundle.

Change-Id: Ie5f488ac4cbdc8ebd989910816b721a1867b80a3
Signed-off-by: Hideyuki Tai <h-tai@cd.jp.nec.com>
10 years agoUpdated versions of ovsdb for base edition.
Hideyuki Tai [Fri, 21 Feb 2014 02:55:54 +0000 (21:55 -0500)]
Updated versions of ovsdb for base edition.

This patch updated pom.xml of base edition to use new versions of
ovsdb bundles.

Change-Id: I2a8362a041a0c8eebddfc03f2fe4604dcaa8151d
Signed-off-by: Hideyuki Tai <h-tai@cd.jp.nec.com>
10 years agoUpdated the bundle filter list in virt edition.
Hideyuki Tai [Fri, 21 Feb 2014 02:42:52 +0000 (21:42 -0500)]
Updated the bundle filter list in virt edition.

This patch updated the bundle filter list for vtn in run.sh of
virtualization edition.

Change-Id: I525f9004ad6c7663f1f6993cfbf86eb8ba23e23e
Signed-off-by: Hideyuki Tai <h-tai@cd.jp.nec.com>
10 years agoUpdated versions of vtn bundles for virt edition.
Hideyuki Tai [Fri, 21 Feb 2014 02:26:07 +0000 (21:26 -0500)]
Updated versions of vtn bundles for virt edition.

This patch updated pom.xml of virtualization edition to use new versions
of vtn bundles.

Change-Id: I6ac623b4fc312f93b52d511380f5e7c0bb59d3d2
Signed-off-by: Hideyuki Tai <h-tai@cd.jp.nec.com>
10 years agoMerge "Update to new version of the artifacts proposed by jenkins-integration-version...
Luis Gomez [Mon, 17 Feb 2014 09:55:30 +0000 (09:55 +0000)]
Merge "Update to new version of the artifacts proposed by jenkins-integration-version-changes-13"

10 years agoUpdate to new version of the artifacts proposed by jenkins-integration-version-changes-13
jenkins-integration [Sun, 16 Feb 2014 00:35:18 +0000 (00:35 +0000)]
Update to new version of the artifacts proposed by jenkins-integration-version-changes-13

Change-Id: Icb0b85cc263723b3dd4dcd0cd6511e26659eaf63
Signed-off-by: jenkins-integration <jekins-integration@opendaylight.org>
10 years agoMerge "Add affinity configuration to start scrpt. Signed-off-by: Suchi Raman <suchi...
Luis Gomez [Fri, 14 Feb 2014 03:30:52 +0000 (03:30 +0000)]
Merge "Add affinity configuration to start scrpt. Signed-off-by: Suchi Raman <suchi.raman@plexxi.com>"

10 years agoAdd affinity configuration to start scrpt.
Suchi Raman [Fri, 14 Feb 2014 02:58:16 +0000 (21:58 -0500)]
Add affinity configuration to start scrpt.
Signed-off-by: Suchi Raman <suchi.raman@plexxi.com>
10 years agoMerge "Update POM files after release - fixing topology version"
Luis Gomez [Wed, 12 Feb 2014 05:11:24 +0000 (05:11 +0000)]
Merge "Update POM files after release - fixing topology version"

10 years agoUpdate POM files after release - fixing topology version
Sam Hague [Mon, 10 Feb 2014 20:20:49 +0000 (15:20 -0500)]
Update POM files after release - fixing topology version

Change-Id: Ic358d3e697a7d4fec96ac22008ec5f54d0d56dd3
Signed-off-by: Luis Gomez <luis.gomez@ericsson.com>
10 years agoAdd missing bundle in affinity package.
Suchi Raman [Sun, 9 Feb 2014 01:44:06 +0000 (20:44 -0500)]
Add missing bundle in affinity package.
Signed-off-by: Suchi Raman <suchi.raman@plexxi.com>
10 years ago[maven-release-plugin] prepare for next development iteration
jenkins-integration [Fri, 31 Jan 2014 17:46:02 +0000 (17:46 +0000)]
[maven-release-plugin] prepare for next development iteration

10 years ago[maven-release-plugin] prepare release master-tagforprepareonly-integration-bulk...
jenkins-integration [Fri, 31 Jan 2014 17:46:01 +0000 (17:46 +0000)]
[maven-release-plugin] prepare release master-tagforprepareonly-integration-bulk-release-2

10 years agoMerge "Respinning for snmp4sdn 0.1.2"
Luis Gomez [Fri, 31 Jan 2014 17:32:57 +0000 (17:32 +0000)]
Merge "Respinning for snmp4sdn 0.1.2"

10 years agoRespinning for snmp4sdn 0.1.2
Ed Warnicke [Fri, 31 Jan 2014 03:01:28 +0000 (21:01 -0600)]
Respinning for snmp4sdn 0.1.2

Change-Id: I06795ba9fc9ff24cd950c068f69baa047362c01a
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoRespinning for lispflowmapping 1.0.1
Ed Warnicke [Fri, 31 Jan 2014 00:59:20 +0000 (18:59 -0600)]
Respinning for lispflowmapping 1.0.1

Patch2:  Remove unused defense4all dependencies

Change-Id: I74c36b803ad57db81afdd9ebb89afebe4ec64c46
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years ago[maven-release-plugin] prepare for next development iteration
jenkins-integration [Tue, 28 Jan 2014 08:02:53 +0000 (08:02 +0000)]
[maven-release-plugin] prepare for next development iteration

10 years ago[maven-release-plugin] prepare release master-tagforprepareonly-integration-bulk...
jenkins-integration [Tue, 28 Jan 2014 08:02:51 +0000 (08:02 +0000)]
[maven-release-plugin] prepare release master-tagforprepareonly-integration-bulk-release-1

10 years agoMerge "Added release version of snmp4sdn to service provider edition pom.xml"
Luis Gomez [Tue, 28 Jan 2014 07:25:13 +0000 (07:25 +0000)]
Merge "Added release version of snmp4sdn to service provider edition pom.xml"

10 years agoAdded release version of snmp4sdn to service provider edition pom.xml
Ed Warnicke [Tue, 28 Jan 2014 07:11:52 +0000 (01:11 -0600)]
Added release version of snmp4sdn to service provider edition pom.xml

Change-Id: I8c7defe7c6814bc9b4891eac1d84552f2b19d759
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoFix to the scm section to make the bulk prepare work
Ed Warnicke [Tue, 28 Jan 2014 07:03:49 +0000 (01:03 -0600)]
Fix to the scm section to make the bulk prepare work

Change-Id: I724644f6343cca25c630972f3603a46bd0571713
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMoved to release versions for most dependencies
Ed Warnicke [Tue, 28 Jan 2014 02:44:47 +0000 (20:44 -0600)]
Moved to release versions for most dependencies

Change-Id: Ica214ad4e6fe604b9cc139adb4d569f091f86f88
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoRevert "Update to new version of the artifacts proposed by jenkins-integration-versio...
Ed Warnicke [Tue, 28 Jan 2014 01:08:33 +0000 (01:08 +0000)]
Revert "Update to new version of the artifacts proposed by jenkins-integration-version-changes-2"

This reverts commit ab4457bfa612980ae0f8a528731b0c2b0c80248a.

Change-Id: I4f217f00ccd417f46aa8e4b6ce465a1b9c2f4ffb
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoUpdate to new version of the artifacts proposed by jenkins-integration-version-changes-2
jenkins-integration [Mon, 27 Jan 2014 22:02:16 +0000 (22:02 +0000)]
Update to new version of the artifacts proposed by jenkins-integration-version-changes-2

Change-Id: I037fafb52b856374382035de543d0eb132250db3
Signed-off-by: jenkins-integration <jekins-integration@opendaylight.org>
10 years agoMerge "Add affinity to virtualization edition. (missed in earlier commits.) Signed...
Luis Gomez [Mon, 27 Jan 2014 17:18:15 +0000 (17:18 +0000)]
Merge "Add affinity to virtualization edition. (missed in earlier commits.) Signed-off-by: Suchi Raman <suchi.raman@plexxi.com>"

10 years agoAdd affinity to virtualization edition. (missed in earlier commits.)
Suchi Raman [Mon, 27 Jan 2014 13:17:32 +0000 (08:17 -0500)]
Add affinity to virtualization edition. (missed in earlier commits.)
Signed-off-by: Suchi Raman <suchi.raman@plexxi.com>
10 years agoAdd README for VTN Coordinator tarball to the Virtualization Edition.
Shigeru Yasuda [Mon, 27 Jan 2014 12:46:54 +0000 (21:46 +0900)]
Add README for VTN Coordinator tarball to the Virtualization Edition.

Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
10 years agoMerge "Fix patch error because of whitespace in run.sh."
Luis Gomez [Thu, 23 Jan 2014 04:50:03 +0000 (04:50 +0000)]
Merge "Fix patch error because of whitespace in run.sh."

10 years agoFix patch error because of whitespace in run.sh.
Sam Hague [Wed, 22 Jan 2014 23:49:43 +0000 (18:49 -0500)]
Fix patch error because of whitespace in run.sh.

Patch fails one hunk because of a mismatch in whitespace.
Also fixed a warning about changelog date being bogus.

Change-Id: Ie387a77bdc1702e19af0e99cec4157140adeb5b2
Signed-off-by: Sam Hague <shague@redhat.com>
10 years agoMerge "Update pom.xml to use group maven repositories"
Luis Gomez [Wed, 22 Jan 2014 22:51:24 +0000 (22:51 +0000)]
Merge "Update pom.xml to use group maven repositories"

10 years agoFixing issue with SP edition pom file
Luis Gomez [Wed, 22 Jan 2014 22:17:27 +0000 (14:17 -0800)]
Fixing issue with SP edition pom file

Change-Id: I21758e78ad1f3762278d252135e40c141055e8a2
Signed-off-by: Luis Gomez <luis.gomez@ericsson.com>
10 years agoUpdate pom.xml to use group maven repositories
Andrew Grimberg [Wed, 22 Jan 2014 21:49:46 +0000 (13:49 -0800)]
Update pom.xml to use group maven repositories

The base pom.xml was still referencing each of the proxied maven
repositories individually. This has been found to cause some weird
issues with builds. Move over to the centralized "group" repository.

Change-Id: I20e55b532ba0bb623c3921e3fbd1e4f4f3421201
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
10 years agoMerge "added missing lispflowmapping projects, and updated versions"
Luis Gomez [Wed, 22 Jan 2014 20:34:35 +0000 (20:34 +0000)]
Merge "added missing lispflowmapping projects, and updated versions"

10 years agoadded missing lispflowmapping projects, and updated versions
David Goldberg [Wed, 22 Jan 2014 15:19:41 +0000 (17:19 +0200)]
added missing lispflowmapping projects, and updated versions

Signed-off-by: David Goldberg <david.goldberg@contextream.com>
10 years agoMerge "base run.sh: simplify CONTROLLER_RUNSH definition"
Ed Warnicke [Wed, 22 Jan 2014 05:57:48 +0000 (05:57 +0000)]
Merge "base run.sh: simplify CONTROLLER_RUNSH definition"

10 years agobase run.sh: simplify CONTROLLER_RUNSH definition
Chris Wright [Wed, 22 Jan 2014 05:46:52 +0000 (21:46 -0800)]
base run.sh: simplify CONTROLLER_RUNSH definition

Simply use dirname/script instead of using sed to alter the script name.
Purely cosmetic preference (and I did it that way in virtualization
run.sh)

Change-Id: I744be66805759f1c2dfec89aa37d99f89b37ea61
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
10 years agovirtualzation run.sh: show help from underlying helper scripts
Chris Wright [Wed, 22 Jan 2014 05:29:11 +0000 (21:29 -0800)]
virtualzation run.sh: show help from underlying helper scripts

Show additional help output from the underlying helper scripts, and
while there fix grammar in existing help text.

Change-Id: Id1680af453b00aa4d3e957c0b58bfdfcc1c5b5d6
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
10 years agovirtualzation run.sh: launch run.base.sh from same path as run.sh
Chris Wright [Wed, 22 Jan 2014 04:30:41 +0000 (20:30 -0800)]
virtualzation run.sh: launch run.base.sh from same path as run.sh

The virtualization edition's run.sh script internally hard codes
the underlying run.base.sh script to be in cwd:

  ./run.base.sh ...

Use a trick similar to the base edition's run.sh script to redirect to
the underlying [run.base.sh] script to use the same path as run.sh.

Note: A platform (like Linux) is likely to place a top-level run.sh
script in a /bin type directory and the underlying internal scripts in
an out-of-$PATH directory like /usr/libexec/.  This may need some final
update based on that, but for now brings the two editions' scripts in
line with one another.

Change-Id: Ia8d719826de02efa6a36d3427f880cf062edc547
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
10 years agoMerge "Small fix to make regex used in sed posix compliant"
Luis Gomez [Mon, 20 Jan 2014 22:56:40 +0000 (22:56 +0000)]
Merge "Small fix to make regex used in sed posix compliant"

10 years agoSmall fix to make regex used in sed posix compliant
Ed Warnicke [Mon, 20 Jan 2014 20:59:02 +0000 (14:59 -0600)]
Small fix to make regex used in sed posix compliant

Change-Id: I2b9d804d9e324b05bf5de1e1ae376132a98da81f
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoAdd new PCEP artifacts
Robert Varga [Mon, 20 Jan 2014 14:49:43 +0000 (15:49 +0100)]
Add new PCEP artifacts

The stateful/initiated draft support is being split into independent
artifact, so that there may be multiple concurrent version present. This
pulls in the new artifacts.

Change-Id: I142b7a5a6911b1a3f4ab756c552f0b39df979a03
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoBGPCEP no longer carries the framework
Robert Varga [Sun, 19 Jan 2014 21:06:45 +0000 (22:06 +0100)]
BGPCEP no longer carries the framework

bgpcep.framework has moved to controller.protocol-framework and BGPCEP
project is using that, so stop bundling the obsolete version.

Change-Id: I2c84152b23306ae6bfb952226b9ffcb6d7cc9df4
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoMerge "Adding DependencyConvergence enforcer to the integration project"
Luis Gomez [Mon, 13 Jan 2014 23:14:37 +0000 (23:14 +0000)]
Merge "Adding DependencyConvergence enforcer to the integration project"

10 years agoAdding DependencyConvergence enforcer to the integration project
Madhu Venugopal [Mon, 13 Jan 2014 22:57:00 +0000 (14:57 -0800)]
Adding DependencyConvergence enforcer to the integration project

To keep the regular bulid from failing, the enforcer is wrapped under a specific profile: dependencyConvergence.
Use the -PdependencyConvergence to enable this profile. We will have to create a daily jenkins job to trigger
this profile and check for the convergence.

Change-Id: If474889ed83f43355d3ee5c5d44d165e0702eaf4
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
10 years agoUpdate opendove artifacts in virtualization pom
rmoats [Mon, 13 Jan 2014 15:58:58 +0000 (09:58 -0600)]
Update opendove artifacts in virtualization pom

After fixing bug 243, opendove artifact versions numbers were bumped.
Reflect this in virtualization pom and remove deprecated artifact.

Change-Id: Ia49e91aaca558ffc27de11a55665a894d7e44f96
Signed-off-by: rmoats <rmoats@us.ibm.com>
10 years agoAdd -of13 switch to turn on OpenFlow 1.3 mode
Ed Warnicke [Mon, 6 Jan 2014 03:32:36 +0000 (19:32 -0800)]
Add -of13 switch to turn on OpenFlow 1.3 mode

Tested in base, virtualization, and serviceprovider edition

In base edition:

./run.sh

osgi> ss | grep openflow
75 ACTIVE      org.opendaylight.controller.protocol_plugins.openflow_0.4.1.SNAPSHOT
172 ACTIVE      org.opendaylight.controller.thirdparty.org.openflow.openflowj_1.0.2

./run.sh -of13

osgi> ss | grep openflow
116 ACTIVE      org.opendaylight.openflowjava.openflow-protocol-spi_0.1.0.SNAPSHOT
131 ACTIVE      org.opendaylight.openflowjava.openflow-protocol-impl_0.1.0.SNAPSHOT
158 ACTIVE      org.opendaylight.openflowplugin_0.0.1.SNAPSHOT
180 ACTIVE      org.opendaylight.openflowjava.openflow-protocol-api_0.1.0.SNAPSHOT

In virtualization edition:

./run.sh

Please select one of the 3 supported Virtualization technology : "./run.sh -virt [ovsdb | opendove | vtn]"

./run.sh -virt ovsdb

osgi> ss | grep vtn
false
osgi> ss | grep opendove
false
osgi> ss | grep openflow
116 ACTIVE      org.opendaylight.controller.protocol_plugins.openflow_0.4.1.SNAPSHOT
229 ACTIVE      org.opendaylight.controller.thirdparty.org.openflow.openflowj_1.0.2

./run.sh -virt opendove

osgi> ss | grep ovsdb
false
osgi> ss | grep vtn
false
osgi> ss | grep openflow
119 ACTIVE      org.opendaylight.controller.protocol_plugins.openflow_0.4.1.SNAPSHOT
232 ACTIVE      org.opendaylight.controller.thirdparty.org.openflow.openflowj_1.0.2

./run.sh -virt vtn

osgi> ss | grep affinity
false
osgi> ss | grep opendove
false
osgi> ss | grep ovsdb
false
osgi> ss | grep arphandler
false
osgi> ss | grep samples
false
osgi> ss | grep openflow
111 ACTIVE      org.opendaylight.controller.protocol_plugins.openflow_0.4.1.SNAPSHOT
217 ACTIVE      org.opendaylight.controller.thirdparty.org.openflow.openflowj_1.0.2

./run.sh -virt ovsdb -of13
osgi> ss | grep vtn
false
osgi> ss | grep opendove
false
osgi> ss | grep ovsdb
89 ACTIVE      org.opendaylight.ovsdb.northbound_0.5.0.SNAPSHOT
95 ACTIVE      org.opendaylight.ovsdb.neutron_0.5.0.SNAPSHOT
198 ACTIVE      org.opendaylight.ovsdb_0.5.0.SNAPSHOT
true
osgi> ss | grep openflow
17 ACTIVE      org.opendaylight.openflowjava.openflow-protocol-impl_0.1.0.SNAPSHOT
121 ACTIVE      org.opendaylight.openflowjava.openflow-protocol-spi_0.1.0.SNAPSHOT
154 ACTIVE      org.opendaylight.openflowplugin_0.0.1.SNAPSHOT
189 ACTIVE      org.opendaylight.openflowjava.openflow-protocol-api_0.1.0.SNAPSHOT

./run.sh -virt opendove -of13

osgi> ss | grep ovsdb
false
osgi> ss | grep vtn
false
osgi> ss | grep opendove
13 ACTIVE      org.opendaylight.opendove.odmc_0.4.0.SNAPSHOT
17 ACTIVE      org.opendaylight.opendove.odmc.rest.northbound_0.4.0.SNAPSHOT
39 ACTIVE      org.opendaylight.opendove.odmc.northbound_0.4.0.SNAPSHOT
71 ACTIVE      org.opendaylight.opendove.odmc.rest.southbound_0.4.0.SNAPSHOT
93 ACTIVE      org.opendaylight.opendove.odmc.implementation_0.4.0.SNAPSHOT
212 ACTIVE      org.opendaylight.opendove.odmc.rest_0.4.0.SNAPSHOT
true
osgi> ss | grep openflow
19 ACTIVE      org.opendaylight.openflowjava.openflow-protocol-impl_0.1.0.SNAPSHOT
124 ACTIVE      org.opendaylight.openflowjava.openflow-protocol-spi_0.1.0.SNAPSHOT
157 ACTIVE      org.opendaylight.openflowplugin_0.0.1.SNAPSHOT
192 ACTIVE      org.opendaylight.openflowjava.openflow-protocol-api_0.1.0.SNAPSHOT

./run.sh -virt vtn -of13

osgi> ss | grep affinity
false
osgi> ss | grep opendove
false
osgi> ss | grep ovsdb
false
osgi> ss | grep arphandler
false
osgi> ss | grep samples
false
osgi> ss | grep vtn
16 ACTIVE      org.opendaylight.vtn.manager_0.1.0.SNAPSHOT
97 ACTIVE      org.opendaylight.vtn.manager.implementation_0.1.0.SNAPSHOT
120 ACTIVE      org.opendaylight.vtn.manager.neutron_0.1.0.SNAPSHOT
219 ACTIVE      org.opendaylight.vtn.manager.northbound_0.1.0.SNAPSHOT
true
osgi> ss | grep openflow
18 ACTIVE      org.opendaylight.openflowjava.openflow-protocol-impl_0.1.0.SNAPSHOT
116 ACTIVE      org.opendaylight.openflowjava.openflow-protocol-spi_0.1.0.SNAPSHOT
146 ACTIVE      org.opendaylight.openflowplugin_0.0.1.SNAPSHOT
180 ACTIVE      org.opendaylight.openflowjava.openflow-protocol-api_0.1.0.SNAPSHOT

In service provider edition:

./run.sh

osgi> ss | grep openflow
66 ACTIVE      org.opendaylight.controller.protocol_plugins.openflow_0.4.1.SNAPSHOT
98 ACTIVE      org.opendaylight.controller.thirdparty.org.openflow.openflowj_1.0.2

./run.sh -of13

osgi> ss | grep openflow
196 ACTIVE      org.opendaylight.openflowplugin_0.0.1.SNAPSHOT
244 ACTIVE      org.opendaylight.openflowjava.openflow-protocol-spi_0.1.0.SNAPSHOT
263 ACTIVE      org.opendaylight.openflowjava.openflow-protocol-impl_0.1.0.SNAPSHOT
275 ACTIVE      org.opendaylight.openflowjava.openflow-protocol-api_0.1.0.SNAPSHOT

Change-Id: Icc42b00b2caf0595b70324625fc75724446ad22a
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoRevert "Add -of13 switch to turn on OpenFlow 1.3 mode"
Madhu Venugopal [Wed, 8 Jan 2014 18:42:28 +0000 (10:42 -0800)]
Revert "Add -of13 switch to turn on OpenFlow 1.3 mode"

This reverts commit b9bf2770fd5e1971f2b3ceba2c7d85a1af1515aa.
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
10 years agoInclude the correct bundles for affinity API.
Suchi Raman [Wed, 8 Jan 2014 14:32:17 +0000 (09:32 -0500)]
Include the correct bundles for affinity API.

Signed-off-by: Suchi Raman <suchi.raman@plexxi.com>
10 years agoMerge "Use 0.4.1 which cleans up depedencies between affinity metadata service and...
Luis Gomez [Tue, 7 Jan 2014 18:01:02 +0000 (18:01 +0000)]
Merge "Use 0.4.1 which cleans up depedencies between affinity metadata service and the flatl2 service (which is used for connectivity/forwarding). This fix is not complete -- what is remaining is a way to use flatl2 only when configured to do so."

10 years agoUse 0.4.1 which cleans up depedencies between affinity metadata
Suchi Raman [Tue, 7 Jan 2014 14:33:34 +0000 (09:33 -0500)]
Use 0.4.1 which cleans up depedencies between affinity metadata
service and the flatl2 service (which is used for
connectivity/forwarding). This fix is not complete -- what is
remaining is a way to use flatl2 only when configured to do so.

Signed-off-by: Suchi Raman <suchi.raman@plexxi.com>
10 years agoAdd -of13 switch to turn on OpenFlow 1.3 mode
Ed Warnicke [Mon, 6 Jan 2014 03:32:36 +0000 (19:32 -0800)]
Add -of13 switch to turn on OpenFlow 1.3 mode

Change-Id: I47e462aca557adc12c3cf3f162aa75c01bf33124
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoBUG-242: extract configuration files from project-provided artifacts
Robert Varga [Fri, 13 Dec 2013 07:59:29 +0000 (08:59 +0100)]
BUG-242: extract configuration files from project-provided artifacts

Change-Id: I05f682a962377943ae0a7f654e2b1df37d3a5c74
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoMerge "Update the bundle filter list in Virtualization edition for VTN"
Luis Gomez [Thu, 12 Dec 2013 17:12:39 +0000 (17:12 +0000)]
Merge "Update the bundle filter list in Virtualization edition for VTN"

10 years agoUpdate the bundle filter list in Virtualization edition for VTN
Hideyuki Tai [Thu, 12 Dec 2013 18:34:21 +0000 (03:34 +0900)]
Update the bundle filter list in Virtualization edition for VTN

Add the following bundles to the bundle filter list in run.sh for VTN.
 * org.opendaylight.affinity
 * org.opendaylight.controller.arphandler
 * org.opendaylight.controller.sample

Change-Id: I6f8a4ce8cc2fa33d02185741aded319cd5050c91
Signed-off-by: Hideyuki Tai <h-tai@cd.jp.nec.com>
10 years agoMerge "Add SNMP4SDN plugin to ServiceProvider"
Luis Gomez [Thu, 12 Dec 2013 17:10:05 +0000 (17:10 +0000)]
Merge "Add SNMP4SDN plugin to ServiceProvider"

10 years agoMerge "Add VTN Coordinator tarball to the Virtualization Edition."
Luis Gomez [Thu, 12 Dec 2013 17:04:39 +0000 (17:04 +0000)]
Merge "Add VTN Coordinator tarball to the Virtualization Edition."

10 years agoMerge "Fixed a bug in the newly added virtualization run.sh script to take in all...
Ed Warnicke [Thu, 12 Dec 2013 14:35:57 +0000 (14:35 +0000)]
Merge "Fixed a bug in the newly added virtualization run.sh script to take in all the extra arguments and pass it along to run.base.sh."

10 years agoFixed a bug in the newly added virtualization run.sh script to take in all the extra...
Madhu Venugopal [Thu, 12 Dec 2013 11:49:35 +0000 (03:49 -0800)]
Fixed a bug in the newly added virtualization run.sh script to take in all the extra arguments and pass it along to run.base.sh.

Change-Id: I4d53d85d8f59075a91168f74f4046d92cf50ab37
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
10 years agoMerge "Updating the Base and Virtualization editions with the latest OVSDB Neutron...
Luis Gomez [Thu, 12 Dec 2013 04:44:34 +0000 (04:44 +0000)]
Merge "Updating the Base and Virtualization editions with the latest OVSDB Neutron and Northbound bundles"

10 years agoUpdating the Base and Virtualization editions with the latest OVSDB Neutron and North...
Madhu Venugopal [Thu, 12 Dec 2013 02:56:10 +0000 (18:56 -0800)]
Updating the Base and Virtualization editions with the latest OVSDB Neutron and Northbound bundles

Change-Id: Idd68daf10d1fe3125148084578441bca21d5ac09
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
10 years agoMerge "Non-intrusive option to select one of the 3 virtualization technologies suppor...
Ed Warnicke [Thu, 12 Dec 2013 02:55:33 +0000 (02:55 +0000)]
Merge "Non-intrusive option to select one of the 3 virtualization technologies supported in Hydrogen release : opendove, ovsdb, vtn."

10 years agoNon-intrusive option to select one of the 3 virtualization technologies supported...
Madhu Venugopal [Thu, 12 Dec 2013 01:27:53 +0000 (17:27 -0800)]
Non-intrusive option to select one of the 3 virtualization technologies supported in Hydrogen release : opendove, ovsdb, vtn.

The basic idea is to make use of the Apache Felix FileInstall to filter out the excluded technology.
In order to avoid introducing multiple config files and keep the changes contained in the Integration branch & Virtualization edition,
we decided to play with a maven assembly plugin option which essentially provides a way to wrap the root run.sh with a virtualization
edition's run.sh.

1. The root run.sh from the base edition is renamed to run.base.sh
2. Introduced a new run.sh (in assemble/resources folder - Note I didnt add it in main/resources to avoid conflicts)
   which is essentially a wrapper for run.base.sh.
3. Maven Assembly plugin takes care of the rest with the <file> and <fileSet> changes.

Change-Id: I76554e60fd3360f6ceea2fec06c98897cac4b99b
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
10 years agoFixup configuration to match base controller
Robert Varga [Tue, 10 Dec 2013 20:24:34 +0000 (21:24 +0100)]
Fixup configuration to match base controller

Change-Id: I0a08a51a3cd59dc0beebecd2f0ddf21c91a3aea1
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoAdd SNMP4SDN plugin to ServiceProvider
ylhsieh [Tue, 10 Dec 2013 07:10:53 +0000 (15:10 +0800)]
Add SNMP4SDN plugin to ServiceProvider

Signed-off-by: ylhsieh <ylhsieh@itri.org.tw>
10 years agoUpdate configuration files to match current expectations
Robert Varga [Sun, 8 Dec 2013 17:38:45 +0000 (18:38 +0100)]
Update configuration files to match current expectations

Change-Id: I1e04ee2974be832b04849e2a712d636b1dccb9cf
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoFix to match changes
Robert Varga [Sun, 8 Dec 2013 12:15:36 +0000 (13:15 +0100)]
Fix to match changes

Change-Id: I9b091627a885e870659efa4f170acec22130a149
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoSplit the configuration into multiple files for clarity
Robert Varga [Tue, 3 Dec 2013 08:47:22 +0000 (09:47 +0100)]
Split the configuration into multiple files for clarity

Change-Id: I57b8bc744270cecca145023370c0df481ecde6fb
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoAdd VTN Coordinator tarball to the Virtualization Edition.
Shigeru Yasuda [Tue, 3 Dec 2013 02:49:56 +0000 (11:49 +0900)]
Add VTN Coordinator tarball to the Virtualization Edition.

The tarball is put in opendaylight/externalapps directory as suggested by:

  https://lists.opendaylight.org/pipermail/vtn-dev/2013-November/000166.html

Change-Id: I72200e996667fa02283f3d90f098a721235fbdeb
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
10 years agoMerge "Make sure bgpcep configuration is included"
Ed Warnicke [Mon, 2 Dec 2013 23:06:06 +0000 (23:06 +0000)]
Merge "Make sure bgpcep configuration is included"

10 years agoMake sure bgpcep configuration is included
Robert Varga [Sun, 1 Dec 2013 14:12:11 +0000 (15:12 +0100)]
Make sure bgpcep configuration is included

Change-Id: I5c45f2b8a38d9459efbcf37f3d12497ef5a2b2c4
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoMerge "Import models required for proper BGP/PCEP operation"
Ed Warnicke [Sun, 1 Dec 2013 13:47:25 +0000 (13:47 +0000)]
Merge "Import models required for proper BGP/PCEP operation"

10 years agoImport models required for proper BGP/PCEP operation
Robert Varga [Sun, 1 Dec 2013 13:35:38 +0000 (14:35 +0100)]
Import models required for proper BGP/PCEP operation

Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoMerge "Update BGPCEP artifacts"
Ed Warnicke [Sun, 24 Nov 2013 21:42:18 +0000 (21:42 +0000)]
Merge "Update BGPCEP artifacts"

10 years agoUpdate BGPCEP artifacts
Robert Varga [Fri, 22 Nov 2013 12:03:31 +0000 (13:03 +0100)]
Update BGPCEP artifacts

Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoAdd *.swp files into the git ignore list.
Baohua Yang [Sun, 17 Nov 2013 12:14:27 +0000 (20:14 +0800)]
Add *.swp files into the git ignore list.

Change-Id: I83df5404691888f405f7ca3b6d65d2067850e800
Signed-off-by: Baohua Yang <baohyang@cn.ibm.com>
10 years agoAdd *.pyc, log.html, output.xml and report.html to the ignore list.
Baohua Yang [Sun, 17 Nov 2013 12:13:19 +0000 (20:13 +0800)]
Add *.pyc, log.html, output.xml and report.html to the ignore list.

Change-Id: I615d11eff75b5e811b37568bbca9be8404b15d0d
Signed-off-by: Baohua Yang <baohyang@cn.ibm.com>
10 years agotest 3 Jenkins
Luis Gomez [Fri, 15 Nov 2013 04:35:22 +0000 (20:35 -0800)]
test 3 Jenkins

Change-Id: Ia3b860a39c0c906320637fce02bcefb754f85fb0
Signed-off-by: Luis Gomez <luis.gomez@ericsson.com>
10 years agoJenkins Test 2
Luis Gomez [Fri, 15 Nov 2013 01:46:17 +0000 (17:46 -0800)]
Jenkins Test 2

Change-Id: I81e25ddf7fe62220bf04d13ba12ef3a5625d0958
Signed-off-by: Luis Gomez <luis.gomez@ericsson.com>
10 years agoAdd neutron bundle from VTN to the Virtualization
Hideyuki [Wed, 13 Nov 2013 08:00:28 +0000 (03:00 -0500)]
Add neutron bundle from VTN to the Virtualization

It adds neutron.manager bundle from VTN Project to the Virtualization
Edition for OpenStack Neutron API support.

Change-Id: I984db1e1629535a1f0371b179b9b8266433963c2
Signed-off-by: Hideyuki <h-tai@cd.jp.nec.com>
10 years agoAdds OVSDB to Base - per TSC vote on Nov 7, 2013
Ed Warnicke [Thu, 31 Oct 2013 18:56:51 +0000 (11:56 -0700)]
Adds OVSDB to Base - per TSC vote on Nov 7, 2013

Change-Id: I2b8bb22569077fc2c869f19a439b9dc0b93b9a77
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoAdd missing bgpcep dependencies to fix serviceprovider startup
Alissa Bonas [Thu, 24 Oct 2013 11:00:02 +0000 (14:00 +0300)]
Add missing bgpcep dependencies to fix serviceprovider startup

Change-Id: I5a9f23d4df1cd4db1d825567a4148005b6816c14
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoExclude defense4all jars from the plugins dir.
Alissa Bonas [Wed, 23 Oct 2013 11:47:24 +0000 (14:47 +0300)]
Exclude defense4all jars from the plugins dir.

Change-Id: I3cd588f963e6fb4751ca37fb6819c14db4b0f61a
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoMerge "Fix file permissions to make it non-executable"
Ed Warnicke [Tue, 22 Oct 2013 18:36:18 +0000 (18:36 +0000)]
Merge "Fix file permissions to make it non-executable"

10 years agoEnable defense4all dependencies in virtualization
Alissa Bonas [Wed, 16 Oct 2013 17:54:06 +0000 (20:54 +0300)]
Enable defense4all dependencies in virtualization

Change-Id: I456971c6984f2d99529be53b676cf14cc4d0b9d3
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoFix file permissions to make it non-executable
Robert Varga [Thu, 17 Oct 2013 08:17:11 +0000 (10:17 +0200)]
Fix file permissions to make it non-executable

Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
10 years agoMerge "Fix missing dep odmc.rest in virtualization"
Ed Warnicke [Wed, 16 Oct 2013 14:24:53 +0000 (14:24 +0000)]
Merge "Fix missing dep odmc.rest in virtualization"

10 years agoFix missing dep odmc.rest in virtualization
Alissa Bonas [Wed, 16 Oct 2013 13:09:55 +0000 (16:09 +0300)]
Fix missing dep odmc.rest in virtualization

Change-Id: Ibca1b1bd7e8d55d52e221b18c80cd243a9d7e3a1
Signed-off-by: Alissa Bonas <abonas@redhat.com>