.dockerignore

@@ -0,0 +1,14 @@
+bin/
+**/*.pyc
+.vagrant
+vagrant/
+docs/
+scripts/gobgp
+# this is the dockerfile for binary compilation, other dockerfiles
+# may want archive artifacts, but this one does not
+*.tar
+**/*.tar.gz
+*.bz2
+# export from a docker container, no need to copy into any docker containers
+install/v2plugin/rootfs
+vagrant/k8s/export/netctl

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,35 @@
+<!--- Thanks for opening an issue.
+
+If this is an issue, please fill in as many details as possible in the bug report information.
+If this is a feature request/enhancement, please mention the use case, expected behavior and examples as necessary.
+-->
+
+<!-- 
+------------------------------------------------------------------------------
+BUG REPORT INFORMATION
+------------------------------------------------------------------------------
+-->
+
+## Description
+<!--- If you're describing a bug, tell us what happened -->
+<!--- If you're suggesting a feature request/enhancement, tell us what you would like to see -->
+
+#### Expected Behavior
+<!--- Describe the expected behavior for the scenario/use case -->
+
+#### Observed Behavior
+<!--- If describing a bug, tell us what happened instead of the expected behavior -->
+<!--- If suggesting a feature request/enhancement, explain the improvement from the current behavior -->
+
+## Steps to Reproduce (for bugs)
+<!--- Please describe the steps to reproduce this bug -->
+1.
+2.
+3.
+4.
+
+## Your Environment
+<!--- Include as many relevant details about the environment in which you experienced the bug-->
+* netctl version
+* Orchestrator version (e.g. kubernetes, mesos, swarm):
+* Operating System and version

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,10 @@
+## Description of the changes
+#### Type of fix: <!-- Bug Fix | New feature | Cosmetic change -->
+#### Fixes #<!-- Issue number -->
+Please describe:
+- changes made in the Pull request
+- type of testing done (both manual and automated)
+
+## TODO
+- [ ] Tests
+- [ ] Documentation

.gitignore

@@ -2,6 +2,7 @@
 *.o
 *.a
 *.so
+*.bz2
 
 # Folders
 _obj
@@ -42,5 +43,34 @@ cscope*
 .out.vagrant
 .etc_hosts
 
-# version
-version/version_gen.go
+# docker v2 plugin files
+install/v2plugin/rootfs
+install/v2plugin/config.json
+install/v2plugin/v2plugin-*.tar.gz
+
+# netcontain temporary build files
+scripts/netContain/bin
+
+# OS specific files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# test files
+test/systemtests/cfg.json
+
+.vagrant-state
+
+netplugin-version
+
+# release artifacts
+scripts/netContain/*.tgz
+scripts/netContain/*.tar.bz2
+
+vagrant/k8s/export/admin.conf
+vagrant/k8s/export/*contiv*
+vagrant/k8s/contrib

CONTRIBUTING.md

@@ -1,169 +1 @@
-## Contributing to Netplugin
-
-Submitting code changes is only one of the many ways to contribute.
-Reporting issues, proposing documentation and design changes,
-discussing use cases and proposing integration with other software
-from the ecosystem are more ways to contribute to netplugin.
-Contributors can also become maintainers.
-
-All contributions are welcome, no matter how small or how big they are.
-
-
-### Reporting Issues
-Issues which aren't related to the code or which are related to usage
-should be reported by clicking `New Issue` on
-[netplugin's issues on github](https://github.com/contiv/netplugin/issues).
-Issues should also be opened for feature requests.
-
-The following pieces of information should be provided when running into
-problems with netplugin:
-- version of the container runtime (e.g. `docker version` for docker)
-- state driver (e.g. etcd)
-- netplugin version
-- driver (e.g. ovs)
-- operating system & version (found in `/etc/os-release` on some distributions, `uname -a`)
-- step by step procedure to reproduce the problem
-- backtrace if any
-
-
-### Submitting pull requests for code or documentation changes
-Changes can be proposed by sending a pull request (PR). One of the maintainers
-will review the changes and provide feedback. The pull request will be merged
-into the master branch after discussion.
-
-Please make sure that the unit tests and the system tests pass before
-submitting the PR. We encourage using [Developer's Guide](docs/DevEnv.md) to use
-well tested steps to make changes to netplugin
-Please keep in mind some changes might not be merged if the maintainers
-decide they can't be merged.
-
-
-### Submitting proposals for major changes
-Please include `Proposal: ...` in the title of the issue if you wish to
-do significant refactoring of the code, to propose a new component or to
-introduce a major change. Marking the issue as a proposal will ensure that
-more people provide feedback as early as possible.
-
-Significant code changes submitted without an accompanying proposal might
-be rejected and not merged. Such significant submissions without a proposal are
-discouraged to avoid wasting time.
-
-
-After design discussions:
-- Fork the netplugin repository to your own public repository
-- Make the changes in your repository in a new branch
-- Add unit and system test cases for your code
-- Make sure existing tests and newly added tests pass
-- Rebase your branch on top of the latest master branch
-- Re-run the unit and system tests
-- Submit a pull request with the code changes
-- A discussion may take place on your pull request
-- Discussing while writing the code is also recommended
-- Requested changes should be made to the same branch on your fork
-- Changes should be force pushed to the same branch of the pull request
-- The unit and system tests need to be run again after the maintainers `LGTM` the change
-- One of the maintainers will merge the changes
-
-
-### Discussing use cases and requesting new features
-Submit an issue to discuss your use case. A description of the use case
-should be provided. The description should also explain why the existing
-features don't help with this use case.
-Feature requests should have a title which starts with `Feature request: ...`.
-We encourage the inclusion of diagrams (or pictures of drawings) and other
-details to provide a better description of the use case.
-
-
-### Becoming a maintainer
-Play with the code and know it inside out. Once you think you are comfortable
-with the code and you think you are ready to become a maintainer, you can send
-an email to one of the maintainers.
-
-### Commit message format guidelines
-The commit message should have a short summary of no more than 50
-characters on the first line. The description should use verbs in the imperative
-(e.g. `netmaster: fix bug`, not `netmaster: fixed bug`).
-The second line should be left empty.
-
-A longer description of what the commit does should start on the third line when
-such a description is deemed necessary. This description needs to be wrapped to
-72 characters. Paragraphs following this one should have an empty line above
-them.
-
-
-### Legal Stuff: Sign your work
-You must sign off on your work by adding your signature at the end of the
-commit message. Your signature certifies that you wrote the patch or
-otherwise have the right to pass it on as an open-source patch. 
-By signing off your work you ascertain following (from [developercertificate.org](http://developercertificate.org/)):
-
-```
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-660 York Street, Suite 102,
-San Francisco, CA 94110 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
-```
-
-Every git commit message must have the following at the end on a separate line:
-
-    Signed-off-by: Joe Smith <joe.smith@email.com>
-
-Your real legal name has to be used. Anonymous contributions or contributions
-submitted using pseudonyms cannot be accepted.
-
-Two examples of commit messages with the sign-off message can be found below:
-```
-netmaster: fix bug
-
-This fixes a random bug encountered in netmaster.
-
-Signed-off-by: Joe Smith <joe.smith@email.com>
-```
-```
-netmaster: fix bug
-
-Signed-off-by: Joe Smith <joe.smith@email.com>
-```
-
-If you set your `user.name` and `user.email` git configuration options, you can
-sign your commits automatically with `git commit -s`.
-
-These git options can be set using the following commands:
-```
-git config user.name "Joe Smith"
-git config user.email joe.smith@email.com
-```
-
-`git commit -s` should be used now to sign the commits automatically, instead of
-`git commit`.
+Please refer to Contiv [community contribution guidelines](http://contiv.github.io/documents/community/CONTRIBUTING.html).

Dockerfile

@@ -1,42 +1,38 @@
-##
-#Copyright 2014 Cisco Systems Inc. All rights reserved.
-#
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License.
-#You may obtain a copy of the License at
-#http://www.apache.org/licenses/LICENSE-2.0
-#
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#See the License for the specific language governing permissions and
-#limitations under the License.
-##
-
-##
-# Container image for netplugin
-#
-# Run netplugin:
-# docker run --net=host <image> -host-label=<label>
-##
-
-FROM golang:1.6.1
-MAINTAINER Madhav Puri <mapuri@cisco.com> (@mapuri)
-
-
-# Insert your proxy server settings if this build is running behind 
-# a proxy.
-#ENV http_proxy ""
-#ENV https_proxy ""
-ENV GOPATH /go/
-
-ENV NET_CONTAINER_BUILD 1
-
-COPY ./ /go/src/github.com/contiv/netplugin/
-
-WORKDIR /go/src/github.com/contiv/netplugin/
-
-RUN make build
-
-ENTRYPOINT ["netplugin"]
-CMD ["--help"]
+# builder is where netplugin got complied
+FROM golang:1.7.6 as builder
+
+ENV GOPATH /go
+
+COPY . $GOPATH/src/github.com/contiv/netplugin/
+
+WORKDIR $GOPATH/src/github.com/contiv/netplugin/
+
+RUN VERSION_SUFFIX="$(if git diff-index --quiet HEAD --; then echo '-unsupported'; fi)" && \
+    GIT_COMMIT=$(git rev-parse --short HEAD)$VERSION_SUFFIX && \
+    BUILD_VERSION=$(git describe --tags --always)$VERSION_SUFFIX  && \
+    PKG_NAME=github.com/contiv/netplugin/version && \
+    BUILD_TIME=$(date -u +%m-%d-%Y.%H-%M-%S.UTC) && \
+    GOGC=1500 CGO_ENABLED=0 go install -v \
+    -a -installsuffix cgo \
+    -ldflags "-X $PKG_NAME.version=$BUILD_VERSION \
+    -X $PKG_NAME.buildTime=$BUILD_TIME \
+    -X $PKG_NAME.gitCommit=$GIT_COMMIT \
+    -s -w -d" -pkgdir /tmp/foo-cgo \
+    ./netplugin/ ./netmaster/ ./netctl/netctl/ ./mgmtfn/k8splugin/contivk8s/ && \
+    mkdir -p /contiv/bin && \
+    for bin in netplugin netmaster netctl contivk8s; do cp /go/bin/$bin /contiv/bin/ ; done && \
+    /contiv/bin/netplugin --version && /contiv/bin/netmaster --version
+
+# The container where netplugin will be run
+FROM ubuntu:16.04
+
+RUN apt-get update \
+ && apt-get install -y openvswitch-switch=2.5.2* \
+        net-tools \
+        iptables \
+ && rm -rf /var/lib/apt/lists/*
+
+COPY --from=builder /contiv/bin/ /contiv/bin/
+COPY --from=builder /go/src/github.com/contiv/netplugin/scripts/netContain/scripts/ /contiv/scripts/
+
+ENTRYPOINT ["/contiv/scripts/contivNet.sh"]

Dockerfile-check

@@ -0,0 +1,10 @@
+FROM golang:1.7.6
+
+ENV GOPATH=/go
+
+WORKDIR /go/src/github.com/contiv/netplugin/
+
+RUN go get github.com/golang/lint/golint \
+           github.com/client9/misspell/cmd/misspell
+
+CMD ["make", "checks"]