neutron.git
9 years agoVersion bump of master to Beryllium versions 07/19907/1
Ed Warnicke [Fri, 8 May 2015 15:57:02 +0000 (08:57 -0700)]
Version bump of master to Beryllium versions

stable/lithium exists and maintains the Li versions

Change-Id: I6d0ea5d2b51b170c12f8dd2c516005027d0768ef
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
9 years agoBug 3139: AbstractNeutronInterface.updateMd() expects target, not delta 07/19707/1
Sam Hague [Wed, 6 May 2015 12:32:28 +0000 (08:32 -0400)]
Bug 3139: AbstractNeutronInterface.updateMd() expects target, not delta

The function updateMd() attempts to create md object from delta, but that
is not enough since delta lacks required fields in the neutron object,
such as key. Fix proposed will provide updateMd() with updated object
which is available after overwrite(target, delta) call.

Change-Id: Id7e451ecdd932cb24f6122796d0453e47308475a
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoBug 3113 - java.lang.NumberFormatException: For input string: "slaac" 33/19633/1
Sam Hague [Tue, 5 May 2015 15:02:12 +0000 (11:02 -0400)]
Bug 3113 - java.lang.NumberFormatException: For input string: "slaac"

Change-Id: I0ddbb2ddd68c434b5cd637d5540a9bdbc3c43dfd
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdded MD-transcribing for NeutronVPNIPSECSiteConnectionsInterface 26/19426/1
bhavesh.kumar1 [Fri, 1 May 2015 04:47:47 +0000 (10:17 +0530)]
Added MD-transcribing for NeutronVPNIPSECSiteConnectionsInterface

Change-Id: I663b9ce8c0705fef837c7a64e8be6c2a1f1e7adb
Signed-off-by: bhavesh.kumar1 <bhavesh.kumar1@tcs.com>
9 years agoMerge "Adding transcriber for NeutronMeteringLabelRuleInterface and NeutronLoadBalanc...
Ryan Moats [Thu, 30 Apr 2015 12:29:38 +0000 (12:29 +0000)]
Merge "Adding transcriber for NeutronMeteringLabelRuleInterface and NeutronLoadBalancerPoolMemverInterface"

9 years agoAdding transcriber for NeutronMeteringLabelRuleInterface and NeutronLoadBalancerPoolM... 78/19378/1
ShreshthaJoshi [Thu, 30 Apr 2015 11:37:38 +0000 (17:07 +0530)]
Adding transcriber for NeutronMeteringLabelRuleInterface and NeutronLoadBalancerPoolMemverInterface

Change-Id: I5467dde8e1a0f57bb6db68fcb58b32ce8650c8ee
Signed-off-by: ShreshthaJoshi <shreshtha.joshi@tcs.com>
9 years agoAdded MD-transcribing for NeutronVPNIKEPolicyInterface 65/19365/1
bhavesh.kumar1 [Thu, 30 Apr 2015 06:11:05 +0000 (11:41 +0530)]
Added MD-transcribing for NeutronVPNIKEPolicyInterface

Change-Id: I7c7d6f7551e096ddce554592255a0608d1c2a24c
Signed-off-by: bhavesh.kumar1 <bhavesh.kumar1@tcs.com>
9 years agoMerge "Adding implementation to transcribe NeutronMeteringLabel"
Ryan Moats [Wed, 29 Apr 2015 15:45:52 +0000 (15:45 +0000)]
Merge "Adding implementation to transcribe NeutronMeteringLabel"

9 years agoFixed neutron transcriber not waiting for its model loaded. 10/19310/1
Tony Tkacik [Wed, 29 Apr 2015 15:06:46 +0000 (17:06 +0200)]
Fixed neutron transcriber not waiting for its model loaded.

Change-Id: I73549acc329340fc6bfe32485f98ebc2de222b8f
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Added MD-transcribing for NeutronSecurityGroupInterface and NeutronVPNServiceI...
Ryan Moats [Wed, 29 Apr 2015 15:00:28 +0000 (15:00 +0000)]
Merge "Added MD-transcribing for NeutronSecurityGroupInterface and NeutronVPNServiceInterface"

9 years agoAdding implementation to transcribe NeutronMeteringLabel 44/19244/2
ShreshthaJoshi [Tue, 28 Apr 2015 17:18:46 +0000 (22:48 +0530)]
Adding implementation to transcribe NeutronMeteringLabel

Change-Id: If212df55a801031fd4c9f40d4b00887ee540c05d
Signed-off-by: ShreshthaJoshi <shreshtha.joshi@tcs.com>
9 years agoMerge "Bug 3072: Make NeutronRoutersNorthbound.addRouterInterface() idem-potent"
Ryan Moats [Wed, 29 Apr 2015 14:48:43 +0000 (14:48 +0000)]
Merge "Bug 3072: Make NeutronRoutersNorthbound.addRouterInterface() idem-potent"

9 years agoMerge "Add md-transcribing for LoadBalancePool."
Ryan Moats [Wed, 29 Apr 2015 14:48:13 +0000 (14:48 +0000)]
Merge "Add md-transcribing for LoadBalancePool."

9 years agoMerge "Add md-transcribing for LoadBalancerListener."
Ryan Moats [Wed, 29 Apr 2015 14:47:49 +0000 (14:47 +0000)]
Merge "Add md-transcribing for LoadBalancerListener."

9 years agoMerge topic 'mdtranscriber'
Ryan Moats [Wed, 29 Apr 2015 14:46:51 +0000 (14:46 +0000)]
Merge topic 'mdtranscriber'

* changes:
  Add md-transcribing for LoadBalancer.
  Add *key ="uuid"* in lists loadbalancers, listeners, pools, members and healthmonitors of grouping lbaas-atrtibutes.

9 years agoAdded MD-transcribing for 96/19296/1
bhavesh.kumar1 [Wed, 29 Apr 2015 12:43:16 +0000 (18:13 +0530)]
Added MD-transcribing for
NeutronSecurityGroupInterface and NeutronVPNServiceInterface

Change-Id: Ia278056649779ee82f17e449d96013a02b6eaac9
Signed-off-by: bhavesh.kumar1 <bhavesh.kumar1@tcs.com>
9 years agoAdded Md-transcibing for 73/19273/2
bhavesh.kumar1 [Wed, 29 Apr 2015 12:08:56 +0000 (17:38 +0530)]
Added Md-transcibing for
NeutronRouterInterface and NeutronSecurityRuleInterface

Change-Id: Ia6c52bc124252ff433db11ccd8aa398b4d75fec7
Signed-off-by: bhavesh.kumar1 <bhavesh.kumar1@tcs.com>
9 years agoAdd md-transcribing for LoadBalancer. 09/19209/4
Alexis de Talhouët [Tue, 28 Apr 2015 13:09:35 +0000 (09:09 -0400)]
Add md-transcribing for LoadBalancer.

Patch Set 2: correct log message "Attempting to write neutron laod balancer without UUID"

Change-Id: I9cc94c1470737a9951c85cbdd6864a9f66d892f2
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoAdd md-transcribing for LoadBalancerListener. 10/19210/3
Alexis de Talhouët [Tue, 28 Apr 2015 13:36:49 +0000 (09:36 -0400)]
Add md-transcribing for LoadBalancerListener.

Patch Set 2: Correct typo in log message

Change-Id: I973a157aff69d342ce42b58a042ca8f20010777d
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoAdd md-transcribing for LoadBalancePool. 23/19223/4
Alexis de Talhouët [Tue, 28 Apr 2015 14:36:56 +0000 (10:36 -0400)]
Add md-transcribing for LoadBalancePool.

Change-Id: Ib477463cb36b26697e97b3f0c06050fd046e2a7c
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoAdd *key ="uuid"* in lists loadbalancers, listeners, pools, members and healthmonitor... 31/19231/2
Alexis de Talhouët [Tue, 28 Apr 2015 15:22:07 +0000 (11:22 -0400)]
Add *key ="uuid"* in lists loadbalancers, listeners, pools, members and healthmonitors of grouping lbaas-atrtibutes.

Also, modify the *leaf id* to *leaf uuid* of grouping healthmonitor-attrs and member-attrs to have consistent key name.
Modify NeutronLoadBalancerHealthMonitorInterface to reflect the change (setId() to setUuid()).

Change-Id: I16baae46c1c0cb3e8a9232af57e89c4051c07b5f
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoBug 3072: Make NeutronRoutersNorthbound.addRouterInterface() idem-potent 80/19180/4
Flavio Fernandes [Mon, 27 Apr 2015 22:38:03 +0000 (18:38 -0400)]
Bug 3072: Make NeutronRoutersNorthbound.addRouterInterface() idem-potent

Neutron port used by the router interface is populated with
the deviceId and deviceOwner values before router interface add
message is received. The existing code for processing router
interface add did not get enabled until recently [1]. Now that
it does get called, it exposes this bug; where the checking
for deviceId and deviceOwner causes ResourceConflictException()
as it was not accounting for existing and new values being
the same.

Patch 2: move static final strings up by a few lines
Patch 3: Rephrase comment
Patch 4: corrected logic - router_gateway port MUST NOT be added
via add_router_interface call

[1]: https://review.openstack.org/#/c/174600/

Change-Id: I69c22dc995d507111673389da110cd9e8db39570
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
9 years agoMerge "Add md-transcribing for HealthMonitors, and add *key "id"* to list healthmonit...
Ryan Moats [Tue, 28 Apr 2015 03:09:02 +0000 (03:09 +0000)]
Merge "Add md-transcribing for HealthMonitors, and add *key "id"* to list healthmonitors in neutron-lbaasv2.yang."

9 years agoMerge "Add md-transcribing for floating IP."
Ryan Moats [Tue, 28 Apr 2015 03:08:29 +0000 (03:08 +0000)]
Merge "Add md-transcribing for floating IP."

9 years agoMerge "Add md-transcribing for Port."
Ryan Moats [Tue, 28 Apr 2015 03:08:00 +0000 (03:08 +0000)]
Merge "Add md-transcribing for Port."

9 years agoAdd md-transcribing for HealthMonitors, and add *key "id"* to list healthmonitors... 70/19170/1
Alexis de Talhouët [Mon, 27 Apr 2015 19:35:01 +0000 (15:35 -0400)]
Add md-transcribing for HealthMonitors, and add *key "id"* to list healthmonitors in neutron-lbaasv2.yang.

Change-Id: I8938709c708f6c3bde85d9606f70b69bcbacd375
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoAdd md-transcribing for floating IP. 51/19151/1
Alexis de Talhouët [Mon, 27 Apr 2015 13:43:28 +0000 (09:43 -0400)]
Add md-transcribing for floating IP.

Change-Id: Ia095cd2fe83e54279e1432d3ec4893d016b9aaec
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoFix JDK8 javadoc compatibility 75/19075/1
Robert Varga [Sat, 25 Apr 2015 09:32:34 +0000 (11:32 +0200)]
Fix JDK8 javadoc compatibility

JDK8 is pickier about javadoc correctness. Fix javadocs so the project
can compile under JDK8.

Change-Id: I600d69a319fd87ef84ae5af3c32a22c1c31eb2ab
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdd md-transcribing for Port. 47/19047/1
Alexis de Talhouët [Fri, 24 Apr 2015 20:34:45 +0000 (16:34 -0400)]
Add md-transcribing for Port.

Change-Id: I0145e745374428014804f9e749a45fe44c0e7448
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoAdded MD-transcribing for Subnet 00/19000/2
bhavesh.kumar1 [Fri, 24 Apr 2015 12:03:10 +0000 (17:33 +0530)]
Added MD-transcribing for Subnet

Change-Id: Icfb2c8e5f72a9d19cbd47ae1fa779d5c96aa2625
Signed-off-by: bhavesh.kumar1 <bhavesh.kumar1@tcs.com>
9 years agoMerge "Added a Postman collection for neutron testing"
Ryan Moats [Fri, 24 Apr 2015 15:13:26 +0000 (15:13 +0000)]
Merge "Added a Postman collection for neutron testing"

9 years agoMerge "Example of MD-transcribing for network"
Ryan Moats [Fri, 24 Apr 2015 15:13:13 +0000 (15:13 +0000)]
Merge "Example of MD-transcribing for network"

9 years agoMerge "Prep work for transcriber writing yang model:"
Ryan Moats [Fri, 24 Apr 2015 15:12:53 +0000 (15:12 +0000)]
Merge "Prep work for transcriber writing yang model:"

9 years agoAdded a Postman collection for neutron testing 79/18779/1
Ed Warnicke [Tue, 21 Apr 2015 20:27:37 +0000 (13:27 -0700)]
Added a Postman collection for neutron testing

Change-Id: I6373528458071b7449fe144abda9dff994508e11
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
9 years agoExample of MD-transcribing for network 78/18778/1
Ed Warnicke [Tue, 21 Apr 2015 18:13:21 +0000 (11:13 -0700)]
Example of MD-transcribing for network

Change-Id: I2d13631bebbed685eb531e978ed45a4a66288cde
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
9 years agoPrep work for transcriber writing yang model: 59/18659/2
Ed Warnicke [Mon, 20 Apr 2015 19:20:30 +0000 (12:20 -0700)]
Prep work for transcriber writing yang model:

1)  Wire in broker with config subsystem
2)  Make sure we are still publishing the OSGI services we used to
3)  Introduce an AbstractNeutronService class to make sure we have
    access to the DataBroker in all service classes.

Change-Id: I1fe214a7523fd7d0cd361957fcf6b182166ec01a
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
9 years agoDo not override odlparent properties. 16/18716/1
Tony Tkacik [Tue, 21 Apr 2015 11:29:55 +0000 (13:29 +0200)]
Do not override odlparent properties.

Change-Id: I01800d72dff99cffd82f854f0563cf8f56a5279c
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Fix for bug 2648"
Ed Warnicke [Fri, 17 Apr 2015 15:20:28 +0000 (15:20 +0000)]
Merge "Fix for bug 2648"

9 years agoMerge "Fix for Bug 2396"
Ed Warnicke [Fri, 17 Apr 2015 15:20:09 +0000 (15:20 +0000)]
Merge "Fix for Bug 2396"

9 years agoAdd implementation of NeutronVPNIPSECSiteConnectionsNorthbound 34/18534/4
bhavesh.kumar1 [Fri, 17 Apr 2015 11:31:13 +0000 (17:01 +0530)]
Add implementation of NeutronVPNIPSECSiteConnectionsNorthbound

Change-Id: I6e22e73214d215214003cf1606ab96438acb3a5b
Signed-off-by: bhavesh.kumar1 <bhavesh.kumar1@tcs.com>
9 years agoAdding implementation for NeutronVPNServicesNorthbound 27/18527/2
ShreshthaJoshi [Fri, 17 Apr 2015 10:37:05 +0000 (16:07 +0530)]
Adding implementation for NeutronVPNServicesNorthbound

Change-Id: Ibb8f4d068e0ad7ae967878340f1ce12fab89643d
Signed-off-by: ShreshthaJoshi <shreshtha.joshi@tcs.com>
9 years agoMake dummy provider actually work 62/18262/2
Ryan Moats [Tue, 14 Apr 2015 12:22:31 +0000 (07:22 -0500)]
Make dummy provider actually work

Change-Id: I3921aa4e0c4ffe3ac0fdc5f7bf5a3e7b6634d609
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoFix for bug 2648 72/18272/1
Ryan Moats [Tue, 14 Apr 2015 14:22:18 +0000 (09:22 -0500)]
Fix for bug 2648

Credit should go to bhavesh.kumar1 <bhavesh.kumar1@tcs.com>
This is merely a cherry pick of patch 14602 from controller

Change-Id: I61eb00461165b702edd2d8469883efb3f1fcbbb3
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoFix for Bug 2396 68/18268/1
Ryan Moats [Tue, 14 Apr 2015 14:07:18 +0000 (09:07 -0500)]
Fix for Bug 2396

Credit for this should go to Shreshtha Joshi as this is just a port from
controller commit 13169

Change-Id: Ib062fa02e36959f5b6d1d5b238b2d2124a2cc42d
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoMerge "Musings towards making dummyprovider accessible"
Ryan Moats [Tue, 14 Apr 2015 13:24:45 +0000 (13:24 +0000)]
Merge "Musings towards making dummyprovider accessible"

9 years agoMerge "add Metering and VPNaaS aspects to dummy provider"
Ed Warnicke [Sat, 11 Apr 2015 00:03:13 +0000 (00:03 +0000)]
Merge "add Metering and VPNaaS aspects to dummy provider"

9 years agoFixed method signature 39/18139/1
Martin Sunal [Fri, 10 Apr 2015 23:43:58 +0000 (01:43 +0200)]
Fixed method signature

Change-Id: Id5d2e78eb93a81b9a16d23ea6f0027b735f4b6da
Signed-off-by: Martin Sunal <msunal@cisco.com>
9 years agoMusings towards making dummyprovider accessible 23/18123/1
Ed Warnicke [Fri, 10 Apr 2015 16:55:03 +0000 (09:55 -0700)]
Musings towards making dummyprovider accessible

Change-Id: I654e2b06c662e51eea0f89351099ccf4b289bbd2
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoFix more copyright citations 12/18112/1
Ryan Moats [Fri, 10 Apr 2015 14:35:43 +0000 (09:35 -0500)]
Fix more copyright citations

Change-Id: Ifa56229559549f574c42f44586e1688b20239bd3
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoMerge "Fix copyright citations"
Flavio Fernandes [Fri, 10 Apr 2015 14:28:00 +0000 (14:28 +0000)]
Merge "Fix copyright citations"

9 years agoMerge "Add implementation of NeutronVPNIKEPoliciesNorthbound"
Flavio Fernandes [Fri, 10 Apr 2015 14:27:54 +0000 (14:27 +0000)]
Merge "Add implementation of NeutronVPNIKEPoliciesNorthbound"

9 years agoMerge "Implement NeutronMeteringLabelRulesNorthbound methods"
Flavio Fernandes [Fri, 10 Apr 2015 14:27:49 +0000 (14:27 +0000)]
Merge "Implement NeutronMeteringLabelRulesNorthbound methods"

9 years agoMerge "Implement NeutronMeteringLabelsNorthbound methods"
Flavio Fernandes [Fri, 10 Apr 2015 14:27:44 +0000 (14:27 +0000)]
Merge "Implement NeutronMeteringLabelsNorthbound methods"

9 years agoFix copyright citations 52/18052/1
Ryan Moats [Thu, 9 Apr 2015 18:28:10 +0000 (13:28 -0500)]
Fix copyright citations

Change-Id: I5904c847666da4119846bfa5bfa3305872f2cfe4
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoAdd implementation of NeutronVPNIKEPoliciesNorthbound 48/18048/4
Ryan Moats [Thu, 9 Apr 2015 16:12:23 +0000 (11:12 -0500)]
Add implementation of NeutronVPNIKEPoliciesNorthbound

Change-Id: I9e89fddcdc534d6abd9bd852ff929de7daec4bc5
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoJUnit JAXB tests for NeutronVPN 19/18019/1
bhavesh.kumar1 [Thu, 9 Apr 2015 12:38:50 +0000 (18:08 +0530)]
JUnit JAXB tests for NeutronVPN

Added Junit JAXB test classes for NeutronVPNDeadPeerDetection,
NeutronVPNIKEPolicy, NeutronVPNIPSECPolicy, NeutronVPNIPSECSiteConnection,
NeutronVPNLifetime and NeutronVPNService.

Change-Id: I946b0e73a13ea0b93f769849000b2b044b9f3bc5
Signed-off-by: bhavesh.kumar1 <bhavesh.kumar1@tcs.com>
9 years agoImplement NeutronMeteringLabelRulesNorthbound methods 32/17932/1
Ryan Moats [Wed, 8 Apr 2015 14:59:22 +0000 (09:59 -0500)]
Implement NeutronMeteringLabelRulesNorthbound methods

Change-Id: Ibfb6ccd6791d0c923cb557fb6d33fdb83a04779b
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoImplement NeutronMeteringLabelsNorthbound methods 75/17875/4
Ryan Moats [Tue, 7 Apr 2015 19:50:57 +0000 (14:50 -0500)]
Implement NeutronMeteringLabelsNorthbound methods

Change-Id: Ibfb378e0302fb0b3dbabdbd9a4138c0bdad3085a
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoJUnit JAXB tests for dependent Neutron classes 11/17911/2
ShreshthaJoshi [Wed, 8 Apr 2015 09:50:05 +0000 (15:20 +0530)]
JUnit JAXB tests for dependent Neutron classes

Covers NeutronNetwork_Segment, Neutron_IPs and Neutron_ID

Change-Id: I70ee097bcb19ad419a904283f63e6e874405f291
Signed-off-by: ShreshthaJoshi <shreshtha.joshi@tcs.com>
9 years agoadd Metering and VPNaaS aspects to dummy provider 91/17791/1
Ryan Moats [Mon, 6 Apr 2015 14:06:08 +0000 (09:06 -0500)]
add Metering and VPNaaS aspects to dummy provider

Change-Id: I97d7b0d83336ea0edec6309fb09ba39916d234d2
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoMerge "JUnit JAXB tests for NeutronLoadBalancerPool"
Ryan Moats [Mon, 6 Apr 2015 13:28:42 +0000 (13:28 +0000)]
Merge "JUnit JAXB tests for NeutronLoadBalancerPool"

9 years agoJUnit JAXB tests for NeutronLoadBalancerPool 91/17691/2
shreshthajoshi [Fri, 3 Apr 2015 09:42:15 +0000 (15:12 +0530)]
JUnit JAXB tests for NeutronLoadBalancerPool

Change-Id: I069c4b27cffcd581bc9db467915211669449c5bc
Signed-off-by: shreshthajoshi <shreshtha.joshi@tcs.com>
9 years agoMerge "Add information to pom for maven central"
Ryan Moats [Fri, 3 Apr 2015 14:56:33 +0000 (14:56 +0000)]
Merge "Add information to pom for maven central"

9 years agoJUnit JAXB tests for NeutronSecurity 96/17696/3
bhavesh.kumar1 [Fri, 3 Apr 2015 12:17:05 +0000 (17:47 +0530)]
JUnit JAXB tests for NeutronSecurity

Added junit JAXB tests for NeutronSecurityGroup and NeutronSecurityRule.
Patch set 3: cleaned nits

Change-Id: I67b7e7ab0bd9d29a7c7fab8cc4fcf27055def178
Signed-off-by: bhavesh.kumar1 <bhavesh.kumar1@tcs.com>
9 years agoAdd information to pom for maven central 67/17667/7
Kiran Sreenivasa [Thu, 2 Apr 2015 18:23:54 +0000 (13:23 -0500)]
Add information to pom for maven central

Patch 4: Added kkoushik's details
Patch 5: Added eaw's details
Patch 6: Added flaviof's details
Patch 7: Added TCS details

Change-Id: I0872d0cf20b86af497dbd371aa504cac718227ec
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Signed-off-by: Kiran Sreenivasa <kkoushik@brocade.com>
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Add neutron FWaaS YANG model"
Ed Warnicke [Thu, 2 Apr 2015 20:40:36 +0000 (20:40 +0000)]
Merge "Add neutron FWaaS YANG model"

9 years agoMerge "Add VPNaaS YANG model"
Ed Warnicke [Thu, 2 Apr 2015 20:40:25 +0000 (20:40 +0000)]
Merge "Add VPNaaS YANG model"

9 years agoMerge "Comments incorporated in NeutronRouter_NetworkReference"
Flavio Fernandes [Thu, 2 Apr 2015 18:10:43 +0000 (18:10 +0000)]
Merge "Comments incorporated in NeutronRouter_NetworkReference"

9 years agoComments incorporated in NeutronRouter_NetworkReference 15/17515/6
bhavesh.kumar1 [Thu, 2 Apr 2015 12:42:49 +0000 (18:12 +0530)]
Comments incorporated in NeutronRouter_NetworkReference

Made changes as per the comment received, added enable_snat and
external_fixed_ip elements in NeutronRouter_NetworkReferenceJAXBTest.java.

Change-Id: If1a34891f42cc2b3e4cba9a73362d028db3bfa0f
Signed-off-by: bhavesh.kumar1 <bhavesh.kumar1@tcs.com>
9 years agoMerge "JUnit JAXB tests for NeutronMeteringLabel, NeutronMeteringLabelRule and Neutro...
Ryan Moats [Thu, 2 Apr 2015 15:55:58 +0000 (15:55 +0000)]
Merge "JUnit JAXB tests for NeutronMeteringLabel, NeutronMeteringLabelRule and NeutronLoadBalancerPoolMember"

9 years agoMerge "Patch 1:Added lbaasv2 to neutron top-level Patch 2: Fixed flavio's comments...
Ryan Moats [Thu, 2 Apr 2015 15:55:45 +0000 (15:55 +0000)]
Merge "Patch 1:Added lbaasv2 to neutron top-level Patch 2: Fixed flavio's comments by changing attrs =>attributes"

9 years agoPatch 1:Added lbaasv2 to neutron top-level 92/17592/2
Kiran Sreenivasa [Wed, 1 Apr 2015 22:37:58 +0000 (15:37 -0700)]
Patch 1:Added lbaasv2 to neutron top-level
Patch 2: Fixed flavio's comments by changing attrs =>attributes

Change-Id: Ie64a62df08da3f522db71aa657998bb1994447e4
Signed-off-by: Kiran Sreenivasa <kkoushik@brocade.com>
9 years agoJUnit JAXB tests for NeutronMeteringLabel, NeutronMeteringLabelRule and NeutronLoadBa... 19/17619/2
shreshthajoshi [Thu, 2 Apr 2015 11:35:07 +0000 (17:05 +0530)]
JUnit JAXB tests for NeutronMeteringLabel, NeutronMeteringLabelRule and NeutronLoadBalancerPoolMember

Patch set 2: changed a few nits

Change-Id: I3659b2626c0f7a99e81ad258c5711440f0acfd1f
Signed-off-by: shreshthajoshi <shreshtha.joshi@tcs.com>
9 years agoBug2940 Removed leading whitespace with "port_range_max" 17/17617/1
bhavesh.kumar1 [Thu, 2 Apr 2015 11:18:20 +0000 (16:48 +0530)]
Bug2940 Removed leading whitespace with "port_range_max"

Removed the leading whitespace from the parameter "port_range_max" in NeutronSecurityRule.java

Change-Id: I3bd1630e36b34ddba94ff5f9c34eb6f46af15b77
Signed-off-by: bhavesh.kumar1 <bhavesh.kumar1@tcs.com>
9 years agoAdd neutron FWaaS YANG model 89/17589/1
Ryan Moats [Wed, 1 Apr 2015 22:15:28 +0000 (17:15 -0500)]
Add neutron FWaaS YANG model

Change-Id: I2234e1d52e996af13a12f101abb0c7d1c5584850
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoMerge "Patch 1:Added the Neutron LBaaSv2.0 model Patch 2: Fixed Ryan's comments"
Ryan Moats [Wed, 1 Apr 2015 21:45:38 +0000 (21:45 +0000)]
Merge "Patch 1:Added the Neutron LBaaSv2.0 model Patch 2: Fixed Ryan's comments"

9 years agoPatch 1:Added the Neutron LBaaSv2.0 model 07/17507/2
Kiran Sreenivasa [Tue, 31 Mar 2015 21:54:42 +0000 (14:54 -0700)]
Patch 1:Added the Neutron LBaaSv2.0 model
Patch 2: Fixed Ryan's comments

Change-Id: I941b74600c0cbba43cd69bf8a15fc86169ccfff9
Signed-off-by: Kiran Sreenivasa <kkoushik@brocade.com>
9 years agoAdd VPNaaS YANG model 82/17582/1
Ryan Moats [Wed, 1 Apr 2015 20:35:21 +0000 (15:35 -0500)]
Add VPNaaS YANG model

Change-Id: Ibc7b4129fa5832b93ed876285215cdec5c88cfac
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoRemove unneeded printStackTrace from junit tests 80/17580/1
Ryan Moats [Wed, 1 Apr 2015 19:29:32 +0000 (14:29 -0500)]
Remove unneeded printStackTrace from junit tests

Change-Id: Id337e150a4add917c3b01a37c531a931566b1ce2
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoMerge "Add Junit testing of JAXB for NeutronPort and LoadBalancer HealthMonitor and...
Ryan Moats [Wed, 1 Apr 2015 19:19:56 +0000 (19:19 +0000)]
Merge "Add Junit testing of JAXB for NeutronPort and LoadBalancer HealthMonitor and Listener"

9 years agoEnsure catch clause fails junit tests 66/17566/2
Ryan Moats [Wed, 1 Apr 2015 16:24:46 +0000 (11:24 -0500)]
Ensure catch clause fails junit tests

If we enter the catch clause in JUnit testing, we want to force
the test to fail.

Change-Id: Ib6262a94e456cb6a76b5dd8b33610a857adb1550
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoMerge changes I4fddcded,I3228fff6
Flavio Fernandes [Wed, 1 Apr 2015 18:59:57 +0000 (18:59 +0000)]
Merge changes I4fddcded,I3228fff6

* changes:
  fix for bug 2928
  Remove MOXy references from Northbound bundle

9 years agofix for bug 2928 50/17550/6
Ryan Moats [Wed, 1 Apr 2015 14:24:43 +0000 (09:24 -0500)]
fix for bug 2928

put moxy back in nb and use it in junit testing

Change-Id: I4fddcded645b5b2db0710058854a64c2935ef041
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoRemove MOXy references from Northbound bundle 81/17481/2
Ryan Moats [Tue, 31 Mar 2015 17:15:27 +0000 (12:15 -0500)]
Remove MOXy references from Northbound bundle

Change-Id: I3228fff644ff651124b69bd3999b4b3db2182282
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoMerge "Align YANG model with POJO updates for Juno"
Ed Warnicke [Wed, 1 Apr 2015 18:07:11 +0000 (18:07 +0000)]
Merge "Align YANG model with POJO updates for Juno"

9 years agoMerge "Add NB interfaces for VPNaaS"
Ed Warnicke [Wed, 1 Apr 2015 18:06:20 +0000 (18:06 +0000)]
Merge "Add NB interfaces for VPNaaS"

9 years agoMerge "Add POJO classes and *Aware Interface for VPNaaS"
Ed Warnicke [Wed, 1 Apr 2015 18:06:04 +0000 (18:06 +0000)]
Merge "Add POJO classes and *Aware Interface for VPNaaS"

9 years agoAdd Junit testing of JAXB for NeutronPort and LoadBalancer HealthMonitor and Listener 23/17523/2
shreshthajoshi [Wed, 1 Apr 2015 10:06:10 +0000 (15:36 +0530)]
Add Junit testing of JAXB for NeutronPort and LoadBalancer HealthMonitor and Listener

Change-Id: Iaad3b4ce09b0fb437d1d1873f123881139c4ae6e
Signed-off-by: shreshthajoshi <shreshtha.joshi@tcs.com>
9 years agoAlign YANG model with POJO updates for Juno 95/17395/2
Ryan Moats [Tue, 31 Mar 2015 02:54:31 +0000 (21:54 -0500)]
Align YANG model with POJO updates for Juno

Bring the YANG model into line with Juno object model.
Break out binding extension into separate model.

Change-Id: I527c5625d14f991afd9030847e7b4d8d8b020f06
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoMerge "Nit: Reorder test numbers"
Ed Warnicke [Wed, 1 Apr 2015 16:50:22 +0000 (16:50 +0000)]
Merge "Nit: Reorder test numbers"

9 years agoAdd NB interfaces for VPNaaS 80/17480/1
Ryan Moats [Tue, 31 Mar 2015 17:10:20 +0000 (12:10 -0500)]
Add NB interfaces for VPNaaS

Change-Id: Iad8d8038f0bd4887855922d72461fa83831421ee
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoAdd POJO classes and *Aware Interface for VPNaaS 77/17477/1
Ryan Moats [Tue, 31 Mar 2015 16:02:39 +0000 (11:02 -0500)]
Add POJO classes and *Aware Interface for VPNaaS

Change-Id: Ic64f93a7cafb20a46bfc04b4a92f6cad9678240e
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoMove all neutron YANG models under "neutron" top-level 86/17386/3
Kiran Sreenivasa [Mon, 30 Mar 2015 20:48:29 +0000 (13:48 -0700)]
Move all neutron YANG models under "neutron" top-level

Patch 1:Moved all the neutron YANG models under the "neutron" top-level as suggested by Ed. Fixed compile errors too.
Patch 2: Fixed Rogue space issues from Flavio.
Patch 3: rebase

Change-Id: I411b1eea5f5a30a1b2b17cb9d5020984803ab349
Signed-off-by: Kiran Sreenivasa <kkoushik@brocade.com>
9 years agoNit: Reorder test numbers 41/17441/1
Ryan Moats [Tue, 31 Mar 2015 13:16:47 +0000 (08:16 -0500)]
Nit: Reorder test numbers

Change-Id: If30301ae0079ea59a3b22777272bf1d493df5be3
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
9 years agoAdd Junit testing of JAXB for NeutronLoadBalancer and NeutronLoadBalancer_SessionPers... 28/17428/1
shreshthajoshi [Tue, 31 Mar 2015 10:42:16 +0000 (16:12 +0530)]
Add Junit testing of JAXB for NeutronLoadBalancer and NeutronLoadBalancer_SessionPersistenceJAXB

Change-Id: I23b4234cfec9b37ec50fb5b4572a4d9d5ad180eb
Signed-off-by: shreshthajoshi <shreshtha.joshi@tcs.com>
9 years agoMerge "JUnit JAXB tests for Neutron Networks"
Flavio Fernandes [Mon, 30 Mar 2015 20:19:32 +0000 (20:19 +0000)]
Merge "JUnit JAXB tests for Neutron Networks"

9 years agoMerge "Update Neutron Port attributes to match OS Kilo model"
Flavio Fernandes [Mon, 30 Mar 2015 20:19:14 +0000 (20:19 +0000)]
Merge "Update Neutron Port attributes to match OS Kilo model"

9 years agoMerge "Update Load Balancer classes to align with OS kilo models"
Flavio Fernandes [Mon, 30 Mar 2015 20:19:03 +0000 (20:19 +0000)]
Merge "Update Load Balancer classes to align with OS kilo models"

9 years agoMerge "Update Router information to match OS kilo model"
Flavio Fernandes [Mon, 30 Mar 2015 20:18:50 +0000 (20:18 +0000)]
Merge "Update Router information to match OS kilo model"

9 years agoUpdate Load Balancer classes to align with OS kilo models 81/17281/2
Ryan Moats [Sat, 28 Mar 2015 13:22:26 +0000 (08:22 -0500)]
Update Load Balancer classes to align with OS kilo models

Change-Id: I1191e29defddc78c42bb8ce5ae8f8dac6149a309
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>