diff --git a/pkg/vpcagent/apihelper/apihelper.go b/pkg/apihelper/apihelper.go similarity index 100% rename from pkg/vpcagent/apihelper/apihelper.go rename to pkg/apihelper/apihelper.go diff --git a/pkg/vpcagent/apihelper/doc.go b/pkg/apihelper/doc.go similarity index 88% rename from pkg/vpcagent/apihelper/doc.go rename to pkg/apihelper/doc.go index 2d3136b78a..59329d59fb 100644 --- a/pkg/vpcagent/apihelper/doc.go +++ b/pkg/apihelper/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package apihelper // import "yunion.io/x/onecloud/pkg/vpcagent/apihelper" +package apihelper // import "yunion.io/x/onecloud/pkg/apihelper" diff --git a/pkg/vpcagent/apihelper/interface.go b/pkg/apihelper/interface.go similarity index 100% rename from pkg/vpcagent/apihelper/interface.go rename to pkg/apihelper/interface.go diff --git a/pkg/vpcagent/apihelper/options.go b/pkg/apihelper/options.go similarity index 100% rename from pkg/vpcagent/apihelper/options.go rename to pkg/apihelper/options.go diff --git a/pkg/vpcagent/apihelper/reflect.go b/pkg/apihelper/reflect.go similarity index 100% rename from pkg/vpcagent/apihelper/reflect.go rename to pkg/apihelper/reflect.go diff --git a/pkg/vpcagent/models/modelset.go b/pkg/vpcagent/models/modelset.go index 1e7536f15a..b88fbd8e8e 100644 --- a/pkg/vpcagent/models/modelset.go +++ b/pkg/vpcagent/models/modelset.go @@ -19,11 +19,11 @@ import ( "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/apihelper" computeapis "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" mcclient_modulebase "yunion.io/x/onecloud/pkg/mcclient/modulebase" mcclient_modules "yunion.io/x/onecloud/pkg/mcclient/modules" - "yunion.io/x/onecloud/pkg/vpcagent/apihelper" ) type ( diff --git a/pkg/vpcagent/models/modelsets.go b/pkg/vpcagent/models/modelsets.go index 1374c2a9d3..aeeb498d68 100644 --- a/pkg/vpcagent/models/modelsets.go +++ b/pkg/vpcagent/models/modelsets.go @@ -17,7 +17,7 @@ package models import ( "time" - "yunion.io/x/onecloud/pkg/vpcagent/apihelper" + "yunion.io/x/onecloud/pkg/apihelper" ) type ModelSetsMaxUpdatedAt struct { diff --git a/pkg/vpcagent/ovn/worker.go b/pkg/vpcagent/ovn/worker.go index fd8990f72e..3e2b5a09ec 100644 --- a/pkg/vpcagent/ovn/worker.go +++ b/pkg/vpcagent/ovn/worker.go @@ -24,10 +24,10 @@ import ( "yunion.io/x/log" "yunion.io/x/pkg/errors" + "yunion.io/x/onecloud/pkg/apihelper" apis "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/mcclient/auth" mcclient_modules "yunion.io/x/onecloud/pkg/mcclient/modules" - "yunion.io/x/onecloud/pkg/vpcagent/apihelper" agentmodels "yunion.io/x/onecloud/pkg/vpcagent/models" "yunion.io/x/onecloud/pkg/vpcagent/options" "yunion.io/x/onecloud/pkg/vpcagent/ovnutil"