objmodel changes

contivmodel.diff

diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
index f14fdc1..fa7c82c
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,9 @@ checks:
 	./scripts/checks "$(PKGS)"
 
 run-build: deps checks clean
-	godep go install -v $(TO_BUILD)
+	cd Godeps/_workspace/src/github.com/contiv/ && chmod -R 771 contivmodel/ && cd contivmodel/ && ./generate.sh && \
+	cd /opt/gopath/src/github.com/contiv/netplugin && \
+	godep go install -v $(TO_BUILD) 
 
 build:
 	make start
 	
 	
 	diff --git a/netmaster/main.go b/netmaster/main.go
index b5a72c0..bb2a097 100644
--- a/netmaster/main.go
+++ b/netmaster/main.go
@@ -35,8 +35,8 @@ import (
 	"github.com/contiv/netplugin/resources"
 	"github.com/contiv/netplugin/state"
 	"github.com/contiv/netplugin/utils"
-	"github.com/contiv/objmodel/objdb"
-	"github.com/contiv/objmodel/objdb/client"
+	"github.com/contiv/objdb"
+	"github.com/contiv/objdb/client"
 	"github.com/gorilla/mux"
 	"github.com/hashicorp/consul/api"
 )
@@ -235,13 +235,13 @@ func registerWebuiHandler(router *mux.Router) {
 	// Setup the router to serve the web UI
 	goPath := os.Getenv("GOPATH")
 	if goPath != "" {
-		webPath := goPath + "/src/github.com/contiv/objmodel/contivModel/www/"
+		webPath := goPath + "/src/github.com/contiv/contivmodel/www/"
 
 		// Make sure we have the web UI files
 		_, err := os.Stat(webPath)
 		if err != nil {
 			webPath = goPath + "/src/github.com/contiv/netplugin/" +
-				"Godeps/_workspace/src/github.com/contiv/objmodel/contivModel/www/"
+				"Godeps/_workspace/src/github.com/contiv/contivmodel/www/"
 			_, err := os.Stat(webPath)
 			if err != nil {
 				log.Errorf("Can not find the web UI directory")
diff --git a/netmaster/master/endpointGroup.go b/netmaster/master/endpointGroup.go
index 8f0dd9d..35e0944 100644
--- a/netmaster/master/endpointGroup.go
+++ b/netmaster/master/endpointGroup.go
@@ -20,12 +20,12 @@ import (
 	"fmt"
 	"strconv"
 
+	"github.com/contiv/contivmodel"
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/gstate"
 	"github.com/contiv/netplugin/netmaster/mastercfg"
 	"github.com/contiv/netplugin/resources"
 	"github.com/contiv/netplugin/utils"
-	"github.com/contiv/objmodel/contivModel"
 
 	log "github.com/Sirupsen/logrus"
 )
diff --git a/netmaster/master/policy.go b/netmaster/master/policy.go
index f7d5218..e046d6d 100644
--- a/netmaster/master/policy.go
+++ b/netmaster/master/policy.go
@@ -16,9 +16,9 @@ limitations under the License.
 package master
 
 import (
+	"github.com/contiv/contivmodel"
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/netmaster/mastercfg"
-	"github.com/contiv/objmodel/contivModel"
 
 	log "github.com/Sirupsen/logrus"
 )
diff --git a/netmaster/mastercfg/policyState.go b/netmaster/mastercfg/policyState.go
index 11acb00..694dd41 100644
--- a/netmaster/mastercfg/policyState.go
+++ b/netmaster/mastercfg/policyState.go
@@ -22,8 +22,8 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 
+	"github.com/contiv/contivmodel"
 	"github.com/contiv/netplugin/core"
-	"github.com/contiv/objmodel/contivModel"
 	"github.com/contiv/ofnet"
 )
 
diff --git a/netmaster/objApi/apiController.go b/netmaster/objApi/apiController.go
index b0732a4..36192a5 100644
--- a/netmaster/objApi/apiController.go
+++ b/netmaster/objApi/apiController.go
@@ -18,12 +18,12 @@ package objApi
 import (
 	"time"
 
+	"github.com/contiv/contivmodel"
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/netmaster/intent"
 	"github.com/contiv/netplugin/netmaster/master"
 	"github.com/contiv/netplugin/utils"
-	"github.com/contiv/objmodel/contivModel"
-	"github.com/contiv/objmodel/objdb/modeldb"
+	"github.com/contiv/objdb/modeldb"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/gorilla/mux"
diff --git a/netmaster/objApi/infraproxy.go b/netmaster/objApi/infraproxy.go
index 03dc0c7..cc566b3 100644
--- a/netmaster/objApi/infraproxy.go
+++ b/netmaster/objApi/infraproxy.go
@@ -10,11 +10,11 @@ import (
 	"strconv"
 
 	log "github.com/Sirupsen/logrus"
+	"github.com/contiv/contivmodel"
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/netmaster/master"
 	"github.com/contiv/netplugin/netmaster/mastercfg"
 	"github.com/contiv/netplugin/utils"
-	"github.com/contiv/objmodel/contivModel"
 )
 
 const (


diff --git a/netplugin/cluster/cluster.go b/netplugin/cluster/cluster.go
index 8d5d739..93d5355 100644
--- a/netplugin/cluster/cluster.go
+++ b/netplugin/cluster/cluster.go
@@ -26,8 +26,8 @@ import (
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/netplugin/plugin"
 	"github.com/contiv/netplugin/utils/netutils"
-	"github.com/contiv/objmodel/objdb"
-	"github.com/contiv/objmodel/objdb/client"
+	"github.com/contiv/objdb"
+	"github.com/contiv/objdb/client"
 	"github.com/contiv/ofnet"
 
 	log "github.com/Sirupsen/logrus"


iff --git a/scripts/deps b/scripts/deps
index 3ac72a5..c161179 100755
--- a/scripts/deps
+++ b/scripts/deps
@@ -2,6 +2,7 @@

 go get github.com/tools/godep
 go get github.com/aktau/github-release
+go get github.com/contiv/modelgen

 if ! go get github.com/golang/lint/golint
 then