Merge pull request #761 from mavenugo/epdel

Allow endpoint delete if sandbox identifier is stale
This commit is contained in:
Jana Radhakrishnan 2015-11-19 21:25:27 +01:00
commit b4ddf18317
2 changed files with 3 additions and 2 deletions

View File

@ -584,7 +584,8 @@ func (ep *endpoint) Delete() error {
ep.Lock()
epid := ep.id
name := ep.name
if ep.sandboxID != "" {
sb, _ := n.getController().SandboxByID(ep.sandboxID)
if sb != nil {
ep.Unlock()
return &ActiveContainerError{name: name, id: epid}
}

View File

@ -112,7 +112,7 @@ function is_network_exist() {
for j in `seq 1 3`;
do
run dnet_cmd $(inst_id2port 2) service unpublish ${osvc}.${oname}
run dnet_cmd $(inst_id2port $i) service unpublish ${osvc}.${oname}
echo ${output}
[ "$status" -ne 0 ]
run dnet_cmd $(inst_id2port $j) network rm ${oname}