Developing...

Author: Strabox

Gopkg.lock

@@ -25,6 +25,23 @@
 # unused-packages = true
 
 
+[[override]]
+ branch = "master"
+ name = "github.com/docker/distribution"
+
+[[override]]
+ name = "github.com/docker/go-connections"
+ version = "0.3.0"
+
+[[override]]
+ branch = "master"
+ name = "github.com/docker/docker"
+
+[[override]]
+ name = "github.com/gorilla/mux"
+ version = "1.6.1"
+
+
 [prune]
  go-tests = true
  unused-packages = true

Gopkg.toml

@@ -1,89 +1,29 @@
-##################### CARAVELA's MAKEFILE #########################
+################ CARAVELA's SIMULATOR MAKEFILE ###############
 GOCMD=go
 
 ######### Builtin GO tools #########
 GOBUILD=$(GOCMD) build
 GOINSTALL=$(GOCMD) install
 GOCLEAN=$(GOCMD) clean
-GOTEST=$(GOCMD) test
-GOVET=$(GOCMD) vet
-
-GOGET=$(GOCMD) get
-
-######### External GO tools #########
-GOLINT=golint
-GOCOV=gocov
-GOCOVHTML=gocov-html
-GODEPGRAPH=godepgraph
 
 ############ Output Files ###########
 EXE=.exe
-BINARY_NAME=caravela$(EXE)
-BINARY_NAME_LINUX=$(BINARY_NAME)_linux$(EXE)
-BINARY_NAME_WIN=$(BINARY_NAME)_win$(EXE)
+BINARY_NAME=caravela_sim$(EXE)
 
-############################## COMMANDS ############################
+########################## COMMANDS ############################
 
-all: test build
+all: build
 
 build:
 @echo Building for the current machine settings...
 $(GOBUILD) -o $(BINARY_NAME) -v
 
-build-linux:
-@echo Building for linux...
-env GOOS=linux $(GOBUILD) -o $(BINARY_NAME) -v
-
-build-windows:
-@echo Building for windows...
-env GOOS=windows $(GOBUILD) -o $(BINARY_NAME) -v
-
 clean:
 @echo Cleaning project...
 $(GOCLEAN)
 rm -f $(BINARY_NAME)
-rm -f $(BINARY_NAME_LINUX)
-rm -f $(BINARY_NAME_WIN)
 
 install:
-@echo Installing CARAVELA in the local GO environment...
+@echo Installing CARAVELA-SIM in the local GO environment...
 $(GOINSTALL) -v -gcflags "-N -l" .
 
-test:
-@echo Testing...
-$(GOTEST) -v ./...
-
-test-cov:
-@echo Testing and coverage report generation...
-$(GOCOV) test ./... | $(GOCOVHTML) > coverage.html
-
-test-verify:
-$(MAKE) test
-@echo Running vet tool to static analyze the code
-$(GOVET) -v ./...
-@echo Running lint tool to static analyze the code style
-
-dep-graph:
-@echo Generating package import dependency graph...
-$(GODEPGRAPH) -s -p github.com/docker github.com/strabox/caravela | dot -Tpng -o importsGraph.png
-
-docker-build:
-@echo Building Docker container...
-docker build --build-arg exec_file=$(BINARY_NAME) --rm -t strabox/caravela:latest .
-
-docker-upload:
-@echo Building Docker container and uploading to DockerHub...
-docker build --build-arg exec_file=$(BINARY_NAME) --rm -t strabox/caravela:latest .
-docker push strabox/caravela:latest
-
-install-external-tools:
-@echo Installing external tools...
-@echo Installing lint - Code style analyzer (from google)
-$(GOGET) github.com/golang/lint
-@echo Installing gocov - Code coverage generator
-$(GOGET) github.com/axw/gocov/gocov
-@echo Installing gocov-html - Code coverage html generator
-$(GOGET) -u gopkg.in/matm/v1/gocov-html
-@echo Installing godepgraph - Code package dependency graph generator
-$(GOGET) github.com/kisielk/godepgraph
-

Makefile

@@ -1,55 +1,70 @@
 package caravela
 
 import (
+"github.com/strabox/caravela-sim/simulation"
 "github.com/strabox/caravela/api/rest"
 "github.com/strabox/caravela/configuration"
 nodeAPI "github.com/strabox/caravela/node/api"
 )
 
 type RemoteClientMock struct {
-// TODO
+sim simulation.Simulator
 }
 
-func NewRemoteClientMock() *RemoteClientMock {
-return &RemoteClientMock{}
+func NewRemoteClientMock(sim simulation.Simulator) *RemoteClientMock {
+return &RemoteClientMock{
+sim: sim,
+}
 }
 
+/*
+===============================================================================
+ Caravela Remote Client Interface
+===============================================================================
+*/
+
 func (mock *RemoteClientMock) CreateOffer(fromSupplierIP string, fromSupplierGUID string, toTraderIP string,
 toTraderGUID string, offerID int64, amount int, cpus int, ram int) error {
-// Do Nothing
+
+mock.sim.NodeByGUID(toTraderGUID).Discovery().CreateOffer(fromSupplierGUID, fromSupplierIP, toTraderGUID,
+offerID, amount, cpus, ram)
 return nil
 }
 
 func (mock *RemoteClientMock) RefreshOffer(toSupplierIP string, fromTraderGUID string, offerID int64) (bool, error) {
-// Do Nothing
-return false, nil
+return mock.sim.NodeByIP(toSupplierIP).Discovery().RefreshOffer(offerID, fromTraderGUID), nil
 }
 
 func (mock *RemoteClientMock) RemoveOffer(fromSupplierIP string, fromSupplierGUID, toTraderIP string,
 toTraderGUID string, offerID int64) error {
-// Do Nothing
+
+mock.sim.NodeByGUID(toTraderGUID).Discovery().RemoveOffer(fromSupplierIP, fromSupplierGUID, toTraderGUID, offerID)
 return nil
 }
 
 func (mock *RemoteClientMock) GetOffers(toTraderIP string, toTraderGUID string, relay bool,
 fromNodeGUID string) ([]nodeAPI.Offer, error) {
-// Do Nothing
-return nil, nil
+
+offers := mock.sim.NodeByGUID(toTraderGUID).Discovery().GetOffers(toTraderGUID, relay, fromNodeGUID)
+return offers, nil
 }
 
 func (mock *RemoteClientMock) AdvertiseOffersNeighbor(toNeighborTraderIP string, toNeighborTraderGUID string,
 fromTraderGUID string, traderOfferingGUID string, traderOfferingIP string) error {
-// Do Nothing
+
+mock.sim.NodeByGUID(toNeighborTraderGUID).Discovery().AdvertiseNeighborOffers(toNeighborTraderGUID, fromTraderGUID,
+traderOfferingIP, traderOfferingGUID)
 return nil
 }
 
 func (mock *RemoteClientMock) LaunchContainer(toSupplierIP string, fromBuyerIP string, offerID int64, containerImageKey string,
 portMappings []rest.PortMapping, containerArgs []string, cpus int, ram int) error {
-// Do Nothing
-return nil
+
+return mock.sim.NodeByIP(toSupplierIP).Scheduler().Launch(fromBuyerIP, offerID, containerImageKey, portMappings, containerArgs,
+cpus, ram)
 }
 
 func (mock *RemoteClientMock) ObtainConfiguration(systemsNodeIP string) (*configuration.Configuration, error) {
-// Do Nothing
+// Do Nothing (For now not necessary for the simulation)
 return nil, nil
 }