Fix issues and remove re-registrations.
Change-Id: Ie9edcaabbc8ce755a20e0f01091562800e0fefb1
diff --git a/models/huawei/BUCK b/models/huawei/BUCK
index a57225e..1d8a1d2 100644
--- a/models/huawei/BUCK
+++ b/models/huawei/BUCK
@@ -2,4 +2,6 @@
yang_model (
app_name = 'org.onosproject.models.huawei',
title = 'Huawei YANG Models',
+ custom_registrator = True,
+ deps = [ '//lib:CORE_DEPS' ]
)
diff --git a/models/huawei/src/main/java/HuaweiModelRegistrator.java b/models/huawei/src/main/java/HuaweiModelRegistrator.java
new file mode 100644
index 0000000..912d068
--- /dev/null
+++ b/models/huawei/src/main/java/HuaweiModelRegistrator.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.models.huawei;
+
+import com.google.common.collect.ImmutableMap;
+import org.apache.felix.scr.annotations.Component;
+import org.onosproject.yang.AbstractYangModelRegistrator;
+import org.onosproject.yang.gen.v1.nebgpcomm.rev20141225.NeBgpcomm;
+import org.onosproject.yang.gen.v1.nebgpcommtype.rev20141225.NeBgpcommType;
+import org.onosproject.yang.gen.v1.nel3vpnapi.rev20141225.NeL3VpnApi;
+import org.onosproject.yang.gen.v1.nel3vpncomm.rev20141225.NeL3Vpncomm;
+import org.onosproject.yang.gen.v1.nel3vpncommtype.rev20141225.NeL3VpncommType;
+import org.onosproject.yang.gen.v1.netnlm.rev20141225.NeTnlm;
+import org.onosproject.yang.gen.v1.netnlmtype.rev20141225.NeTnlmType;
+import org.onosproject.yang.model.DefaultYangModuleId;
+import org.onosproject.yang.model.YangModuleId;
+import org.onosproject.yang.runtime.AppModuleInfo;
+import org.onosproject.yang.runtime.DefaultAppModuleInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Representation of huawei model registrator which registers huawei device
+ * models.
+ */
+@Component(immediate = true)
+public class HuaweiModelRegistrator extends AbstractYangModelRegistrator {
+
+ /**
+ * Creates L3VPN model registrator.
+ */
+ public HuaweiModelRegistrator() {
+ super(HuaweiModelRegistrator.class, getAppInfo());
+ }
+
+ private static Map<YangModuleId, AppModuleInfo> getAppInfo() {
+ Map<YangModuleId, AppModuleInfo> appInfo = new HashMap<>();
+ appInfo.put(new DefaultYangModuleId("ne-bgpcomm", "2014-12-25"),
+ new DefaultAppModuleInfo(NeBgpcomm.class, null));
+ appInfo.put(new DefaultYangModuleId("ne-bgpcomm-type", "2014-12-25"),
+ new DefaultAppModuleInfo(NeBgpcommType.class, null));
+ appInfo.put(new DefaultYangModuleId("ne-l3vpn-api", "2014-12-25"),
+ new DefaultAppModuleInfo(NeL3VpnApi.class, null));
+ appInfo.put(new DefaultYangModuleId("ne-l3vpncomm", "2014-12-25"),
+ new DefaultAppModuleInfo(NeL3Vpncomm.class, null));
+ appInfo.put(new DefaultYangModuleId("ne-l3vpncomm-type", "2014-12-25"),
+ new DefaultAppModuleInfo(NeL3VpncommType.class, null));
+ appInfo.put(new DefaultYangModuleId("ne-tnlm", "2014-12-25"),
+ new DefaultAppModuleInfo(NeTnlm.class, null));
+ appInfo.put(new DefaultYangModuleId("ne-tnlm-type", "2014-12-25"),
+ new DefaultAppModuleInfo(NeTnlmType.class, null));
+ return ImmutableMap.copyOf(appInfo);
+ }
+}
diff --git a/models/huawei/src/main/java/package-info.java b/models/huawei/src/main/java/package-info.java
new file mode 100644
index 0000000..0169ca5
--- /dev/null
+++ b/models/huawei/src/main/java/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Huawei YANG models.
+ */
+package org.onosproject.models.huawei;