Skip to content

Commit

Permalink
Merge pull request #1 from ContainX/master
Browse files Browse the repository at this point in the history
update my repo
  • Loading branch information
ijunjie authored Dec 20, 2017
2 parents 8ead0c2 + bcf3a13 commit 49f8e34
Show file tree
Hide file tree
Showing 1,793 changed files with 105,203 additions and 7,768 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ test-output
pom-shade.xml
*.releaseBackup
*.versionsBackup
*/bin/*
*.iml
*.ipr
*.iws
29 changes: 24 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,31 @@ language: java

jdk:
- oraclejdk7
- openjdk7

env:
global:
- SKIP_JDK8_MODULES='-pl !org.pacesys.openstack4j.connectors:openstack4j-http-connector,!org.pacesys.openstack4j.connectors:openstack4j-jersey2,!org.pacesys:it-jersey2'
- DEPLOY=0

matrix:
include:
- jdk: "oraclejdk8"
env:
- SKIP_JDK8_MODULES=""
- DEPLOY=1

notifications:
email: false

# whitelist
branches:
only:
- master
install: /bin/true

# When run on JDK7, modules that require JDK8 needs to be skipped
script: mvn clean verify -B $SKIP_JDK8_MODULES

after_success:
- "[[ $DEPLOY == 1 && $TRAVIS_BRANCH == \"master\" ]] && { mvn deploy --settings distribution/settings.xml -DskipTests=true -B; };"

# disable sudo to ensure that this build runs on the travis container-based
# infrastructure. This should prevent the buffer overflow from
# https://github.com/travis-ci/travis-ci/issues/5227
sudo: false
132 changes: 131 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,136 @@
# Change Log

### 2.0.3 (Latest Release / Stable)
### 3.0.0 (Latest / Stable)

This is a major milestone release which was driven and lead by @auhlig and @dhague. Special thanks for their major contributions and making this release possible.

As a result we have added 2.0-maintenance branch which is the path to EOL for OpenStack4j 2.0.X series.

##### Breaking Changes

* Java 8 as minimum - therefore dropping support for Jersey2-jdk16 connector
* Upgraded Jackson to 2.7.3
* SLF4j 1.7.21 as sole logging implementation

##### Misc
* Introduced Groovy tests written in Groovy using Betamax to record and replay client-server communication
* Clean split of the implementation by Identity version:
* Package names reflect different versions (*.identity.v2.* and *.identity.v3.* )
* Instead of the old version-mixed OSClient a OSClientV2 for only Identity V2 API and OSClientV3 for only Identity V3 API are available
* Same refactoring for the OSClientSession: introducing new OSClientSessionV2 and OSClientV3

### 2.20

This marks the last of the 2.X OpenStack4j versioning scheme. Going forward only critical or specific pull requests will justify future release. It is strongly encourage to consider moving to OpenStack4j 3.0.X which offers the full Identity V3 Support.

### 2.0.9

##### Enhancements/Improvements

* Issue #503 - domain scoped authentication with tests - Thank you - @auhlig

##### Fixes

* Issue #454 - Tenant and user id not in Volume - Thank you - @iviireczech



### 2.0.8

##### Enhancements/Improvements

* Issue #492 - Telemetry Events API - Thank you - @iviireczech
* Issue #500 - Use Enums instead of String for sourceType and destinationType in block mappings

##### Fixes

* Issue #489 - Race Condition in DefaultEndpointURLResolver - Thank you - @rvesselinov
* Issue #501 - Avoid using printStackTrace() for exception logging

### 2.0.7

##### Enhancements/Improvements

* Issue #479 - Support for Identity V3 - Thank you - @auhlig
* Issue #474 - NetQuotaService does not accept/return security_group and security_group_rule quota - Thank you @abareghi
* Issue #390 - Support for newest Service Versions

##### Fixes

* Issue #485 - Not returning sub-directories under a directory in Swift - Thank you - @sbcd90
* Issue #470 - Create (boot) server call fails against DevStack due to optional parameters in JSON payload in the request
* Issue #458 - java.lang.NullPointerException when getting servers list - Thank you @symcssn
* Issue #448 - RACKSPACE: Unable to Find Supported Services

### 2.0.6

##### Enhancements/Improvements

* Issue #450 - Make configDrive() accessible from Server Create builder - Thank you - @imclem

##### Fixes

* Issue #459 - NPE from keystone v3 re-auths - Thank you - @symcssn
* Issue #446 - DLPayload does not return proper response to allow proper handling - Thank you @symcssn
* Issue #444 - OSAuthenticator.authenticateV3 does not reauthenticate properly - Thank you @symcssn

### 2.0.5

##### Enhancements/Improvements

* Issue #439 - Add query parameters to delete and put options for large objects - Thank you - @frsyuki
* Issue #438 - Add support for RAX API key authentication extension - Thank you - @frsyuki
* Issue #437 - Add support to list available zone list - Thank you - @csm1sh
* Issue #436 - New commands for blockVolume - Thank you - @pompinis
* Issue #431 - Added docker container format - Thank you - @maseev

##### Fixes

* Issue #424 - Create server error through blockDeviceMappingBuilder
* Issue #410 - Create instance boot from image(create a new volume)

### 2.0.4

##### Enhancements/Improvements

* Issue #392 - Allow HttpClient interceptor to allow for custom configuration prior to client creation
* Issue #366 - Identity v3 scoped auth token
* Issue #358 - Create OSClient from auth_token
* Issue #352 - Ability to set Proxy information within OpenStack4j Config
* Issue #350 - Add support to determine if Ceilometer is installed
* Issue #349 - Update LBaaS to use Enums instead of String values
* Issue #348 - Neutron (FwaaS) Firewall Policy API & Test Cases (Completed API)
* Issue #343 - Add filter support when listing Volume and Volume Snapshot
* Issue #340 - Support for Network Extension: Firewall As a Service (FwaaS)
* Issue #337 - Enhancement Request: ability to fetch ALL metadata for objects/containers
* Issue #332 - Refactor HttpClient Connector to use singleton of the Apache HttpClient

##### Fixes

* Issue #420 - Bug fix for the get_files. The key should be the file name
* Issue #418 - Bugs regarding updating object metadata
* Issue #414 - FlavorServiceImpl.listExtraSpecs NullPointerException
* Issue #413 - ObjectStorageObjectServiceImpl.get(ObjectLocation) throws NPE
* Issue #412 - httpclient connector leaks connections on failed authentication attempts and eventually hangs
* Issue #411 - [Partial Fix] Connection leak from usage of BaseOpenStackService.Invocation.executeWithResponse()
* Issue #403 - The KeystoneServiceEndpoint miss @JsonRootName("endpoint")
* Issue #401 - NullPointerException from listing operation and authentication operation
* Issue #397 - FloatingIPServiceImpl.create don't need floatingIp.getPortId()
* Issue #394 - HttpClient connection leak when processing Server Errors
* Issue #393 - The FlavorServiceImpl.removeTenantAccess method error
* Issue #391 - FlavorServiceImpl.getSpec /flavors/%s/os-extra_specs/%s/ uri error
* Issue #376 - Deserialization error with HttpURL connector
* Issue #373 - Connection leak when using HttpClient connector
* Issue #365 - Compute: Add/Remove SecGroup 500 exception not caught.
* Issue #360 - Connection leak when using HttpClient connector
* Issue #357 - ObjectService.list(containerDoesNotExist) throws NullPointerException
* Issue #356 - Requests to Swift hang after 2nd request
* Issue #336 - Exception when deleting an unexisting Glance image
* Issue #333 - Default value set to 0 for NetSecurityGroupRules : port range
* Issue #327 - SwiftAccount account = os.objectStorage().account().get()
* Issue #314 - EofSensorInputStream throws JsonParseException for 404s. Also, inconsistent behavior of how 404s are handled

### 2.0.3

##### Enhancements/Improvements

Expand Down
11 changes: 6 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Bug Fixes and New Features
--------------------------

Before starting to write code, look for existing [tickets]
(https://github.com/gondor/openstack4j/issues?state=open) or [create one]
(https://github.com/gondor/openstack4j/issues/new)
(https://github.com/ContainX/openstack4j/issues?state=open) or [create one]
(https://github.com/ContainX/openstack4j/issues/new)
for your bug, issue, or feature request. This helps the community
avoid working on something that might not be of interest or which
has already been addressed.
Expand All @@ -22,16 +22,17 @@ Pull requests should be made against the master (development)
branch and include relevant tests, if applicable.

Code should compile and tests should pass under all Java versions
which the OpenStack4j currently supports. Currently we support
a minimum version of Java 6.
which the OpenStack4j currently supports.
Refer to [unit tests README](./core-test/README.md) or [integration tests README](./core-integration-test/README.md) for more details on how to write tests.
Currently we support a minimum version of Java 7.

Please insure all code is formatted like the rest of the API, well documented and same patterns applied. When configuring your IDE workspace make sure tabs are represented as spaces.

Chat With Me
------------

If you want to work on something or have questions / complaints please reach
out to me by creating a Question issue at https://github.com/gondor/openstack4j/issues/new or better yet join our group at http://groups.google.com/group/openstack4j
out to me by creating a Question issue at https://github.com/ContainX/openstack4j/issues/new or better yet join our group at http://groups.google.com/group/openstack4j

Thank you for your support!

Expand Down
11 changes: 11 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM maven:latest

COPY . /usr/src/app
WORKDIR /usr/src/app

RUN useradd -m -u 1000 builder
RUN chown -R builder /usr/src/app
USER builder

RUN mvn clean compile

24 changes: 24 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Make file used to build and test within Docker for prestine environment (Maven) tests
# Creates a Docker image locally in the format of "openstack4j-dev" with a tag of the current branch when make is executed

.PHONY: all test

GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
IMAGE_NAME := openstack4j-dev$(if $(GIT_BRANCH),:$(GIT_BRANCH))
DOCKER_RUN := docker run --rm -it --privileged -e MAVEN_CONFIG=/home/builder/.m2 $(IMAGE_NAME)

default: build

all: compile test

compile: build
$(DOCKER_RUN) mvn clean compile

test: build
$(DOCKER_RUN) mvn verify

package: build
$(DOCKER_RUN) mvn clean package

build:
docker build -t "$(IMAGE_NAME)" .
Loading

0 comments on commit 49f8e34

Please sign in to comment.