diff --git a/mesos/filter/constraints.go b/mesos/filter/constraints.go index e4f1fb3e..2ed79266 100644 --- a/mesos/filter/constraints.go +++ b/mesos/filter/constraints.go @@ -58,19 +58,3 @@ func (f *constraintsFilter) getAttrs(agentIp string) map[string]string { return s.Attrs } - -func merge(a map[string]string, b map[string]string) map[string]string { - c := make(map[string]string) - - for k, v := range a { - c[k] = v - } - - for k, v := range b { - if _, ok := c[k]; !ok { - c[k] = v - } - } - - return c -} diff --git a/store/etcd/etcd.go b/store/etcd/etcd.go index 3a9665c8..2902568d 100644 --- a/store/etcd/etcd.go +++ b/store/etcd/etcd.go @@ -20,7 +20,6 @@ const ( keyComposeNG = "/composes-ng" // compose instance (group apps) keyFrameworkID = "/framework" // framework id keyAgent = "/mesos/agents" - keyVCluster = "/vclusters" keyTasks = "tasks" // sub key of keyApp keyVersions = "versions" // sub key of keyApp @@ -61,7 +60,7 @@ func NewEtcdStore(addrs []string) (*EtcdStore, error) { } // create base keys nodes - for _, node := range []string{keyApp, keyCompose, keyComposeNG, keyAgent, keyVCluster} { + for _, node := range []string{keyApp, keyCompose, keyComposeNG, keyAgent} { store.ensureDir(node) } diff --git a/store/etcd/node.go b/store/etcd/node.go deleted file mode 100644 index c8d07cde..00000000 --- a/store/etcd/node.go +++ /dev/null @@ -1,25 +0,0 @@ -package etcd - -import ( - "github.com/Dataman-Cloud/swan/types" -) - -func (s *EtcdStore) CreateNode(vclusterId string, node *types.Node) error { - return nil -} - -func (s *EtcdStore) GetNode(vId, nodeId string) (*types.Node, error) { - return nil, nil -} - -func (s *EtcdStore) UpdateNode(vId string, node *types.Node) error { - return nil -} - -func (s *EtcdStore) ListNodes(vId string) ([]*types.Node, error) { - return nil, nil -} - -func (s *EtcdStore) DeleteNode(name, nodeIp string) error { - return nil -} diff --git a/store/zk/node.go b/store/zk/node.go deleted file mode 100644 index 91063b0e..00000000 --- a/store/zk/node.go +++ /dev/null @@ -1,80 +0,0 @@ -package zk - -import ( - "fmt" - "path" - - "github.com/Dataman-Cloud/swan/types" - - log "github.com/Sirupsen/logrus" -) - -func (zk *ZKStore) CreateNode(vclusterId string, node *types.Node) error { - bs, err := encode(node) - if err != nil { - return err - } - - p := path.Join(keyVCluster, vclusterId, "nodes", node.IP) - - return zk.createAll(p, bs) -} - -func (zk *ZKStore) GetNode(vId, nodeId string) (*types.Node, error) { - p := path.Join(keyVCluster, vId, "nodes", nodeId) - - data, _, err := zk.get(p) - if err != nil { - if err == errNotExists { - return nil, fmt.Errorf("node %s not exist", nodeId) - } - - return nil, err - } - - node := new(types.Node) - if err := decode(data, node); err != nil { - return nil, err - } - - return node, nil -} - -func (zk *ZKStore) UpdateNode(vId string, node *types.Node) error { - bs, err := encode(node) - if err != nil { - return err - } - - p := path.Join(keyVCluster, vId, "nodes", node.IP) - - return zk.set(p, bs) -} - -func (zk *ZKStore) ListNodes(vId string) ([]*types.Node, error) { - p := path.Join(keyVCluster, vId, "nodes") - - children, err := zk.list(p) - if err != nil { - return nil, err - } - - nodes := make([]*types.Node, 0) - for _, child := range children { - node, err := zk.GetNode(vId, child) - if err != nil { - log.Errorf("ListNodes.GetNode error: %v", err) - continue - } - - nodes = append(nodes, node) - } - - return nodes, nil -} - -func (zk *ZKStore) DeleteNode(name, nodeIp string) error { - p := path.Join(keyVCluster, name, "nodes", nodeIp) - - return zk.del(p) -} diff --git a/store/zk/zk.go b/store/zk/zk.go index 17456740..16fe4368 100644 --- a/store/zk/zk.go +++ b/store/zk/zk.go @@ -30,7 +30,6 @@ const ( keyComposeNG = "/composes-ng" // compose instance (group apps) keyFrameworkID = "/frameworkId" // framework id keyAgent = "/agents" // mesos agent with attributes - keyVCluster = "/vclusters" // mesos virtual cluster ) var baseKeys = []string{ @@ -39,7 +38,6 @@ var baseKeys = []string{ keyComposeNG, keyFrameworkID, keyAgent, - keyVCluster, } type ZKStore struct { diff --git a/types/task.go b/types/task.go index 75ac3a67..b34222db 100644 --- a/types/task.go +++ b/types/task.go @@ -81,7 +81,6 @@ type TaskConfig struct { Constraints []*Constraint `json:"constraints"` Proxy *Proxy `json:"proxy"` Version string `json:"version"` - Cluster string `json:"cluster"` } func NewTaskConfig(spec *Version, idx int) *TaskConfig { @@ -107,7 +106,6 @@ func NewTaskConfig(spec *Version, idx int) *TaskConfig { Constraints: spec.Constraints, Proxy: spec.Proxy, Version: spec.ID, - Cluster: spec.Cluster, } // with user specified ip address diff --git a/types/vcluster.go b/types/vcluster.go deleted file mode 100644 index 604146aa..00000000 --- a/types/vcluster.go +++ /dev/null @@ -1,28 +0,0 @@ -package types - -import ( - "time" -) - -type VCluster struct { - ID string `json:"id"` - Name string `json:"name"` - Nodes []*Node `json:"nodes"` - Created time.Time `json:"created"` - Updated time.Time `json:"updated"` -} - -type Node struct { - ID string `json:"id"` - IP string `json:"ip"` - Attrs map[string]string `json:"attrs"` -} - -type CreateVClusterBody struct { - Name string `json:"name"` -} - -type CreateNodeBody struct { - ID string `json:"id"` - IP string `json:"ip"` -}