[VOL-4247] Using latest upstream ONOS chart and removing custom onos-config-loader from the voltha-infra-chart

Change-Id: I7560442c0c2e57d0a589ce00b1c07ca6b7aa6777
diff --git a/examples/tt-values.yaml b/examples/tt-values.yaml
index 4f47c15..ba2c9aa 100644
--- a/examples/tt-values.yaml
+++ b/examples/tt-values.yaml
@@ -15,74 +15,75 @@
 # limitations under the License.
 
 # override ONOS config
-onos:
-  netcfg: >
-    {
-      "apps" : {
-        "org.opencord.igmpproxy" : {
-          "igmpproxy":{
-             "FastLeave":"true",
-             "LastQueryInterval":1,
-             "MaxResp":1,
-             "enableIgmpProvisioning":"false",
-             "globalConnectPointMode":"true",
-             "globalConnectPoint" : "of:0000000000000001/3",
-             "sourceDeviceAndPort":"of:0000000000000001/3",
-             "outgoingIgmpVlanId":550,
-             "outgoingIgmpInnerVlanId":55,
-             "outgoingIgmpWithV3":"true",
-             "IgmpCos":5,
-             "IgmpUniCos":5,
-             "PeriodicQuery":"true",
-             "KeepAliveInterval":60,
-             "KeepAliveCount":5,
-             "requestDsIgmpPackets":false
-          }
-        },
-        "org.opencord.dhcpl2relay" : {
-          "dhcpl2relay" : {
-            "useOltUplinkForServerPktInOut" : true
-          }
-        },
-        "org.opencord.kafka": {
-          "kafka" : {
-            "bootstrapServers" : "{{ .Release.Name }}-kafka.{{ .Release.Namespace }}.svc:9092"
-          }
-        },
-        "org.opencord.sadis": {
-          "sadis": {
-            "integration": {
-              "url": "http://bbsim-sadis-server.{{ .Release.Namespace }}.svc:58080/subscribers/%s",
-              "cache": {
-                "enabled": true,
-                "maxsize": 50,
-                "ttl": "PT1m"
-              }
+onos-classic:
+  config:
+    netcfg: >
+      {
+        "apps" : {
+          "org.opencord.igmpproxy" : {
+            "igmpproxy":{
+              "FastLeave":"true",
+              "LastQueryInterval":1,
+              "MaxResp":1,
+              "enableIgmpProvisioning":"false",
+              "globalConnectPointMode":"true",
+              "globalConnectPoint" : "of:0000000000000001/3",
+              "sourceDeviceAndPort":"of:0000000000000001/3",
+              "outgoingIgmpVlanId":550,
+              "outgoingIgmpInnerVlanId":55,
+              "outgoingIgmpWithV3":"true",
+              "IgmpCos":5,
+              "IgmpUniCos":5,
+              "PeriodicQuery":"true",
+              "KeepAliveInterval":60,
+              "KeepAliveCount":5,
+              "requestDsIgmpPackets":false
             }
           },
-          "bandwidthprofile": {
-            "integration": {
-              "url": "http://bbsim-sadis-server.{{ .Release.Namespace }}.svc:58080/profiles/%s",
-              "cache": {
-                "enabled": true,
-                "maxsize": 50,
-                "ttl": "PT1m"
+          "org.opencord.dhcpl2relay" : {
+            "dhcpl2relay" : {
+              "useOltUplinkForServerPktInOut" : true
+            }
+          },
+          "org.opencord.kafka": {
+            "kafka" : {
+              "bootstrapServers" : "{{ .Release.Name }}-kafka.{{ .Release.Namespace }}.svc:9092"
+            }
+          },
+          "org.opencord.sadis": {
+            "sadis": {
+              "integration": {
+                "url": "http://bbsim-sadis-server.{{ .Release.Namespace }}.svc:58080/subscribers/%s",
+                "cache": {
+                  "enabled": true,
+                  "maxsize": 50,
+                  "ttl": "PT1m"
+                }
+              }
+            },
+            "bandwidthprofile": {
+              "integration": {
+                "url": "http://bbsim-sadis-server.{{ .Release.Namespace }}.svc:58080/profiles/%s",
+                "cache": {
+                  "enabled": true,
+                  "maxsize": 50,
+                  "ttl": "PT1m"
+                }
               }
             }
           }
         }
       }
-    }
-  componentConfig:
-    "org.opencord.olt.impl.OltFlowService": >
-      {
-        "enableDhcpOnNni": "true",
-        "defaultTechProfileId": "64",
-        "enableIgmpOnNni": "true",
-        "enableEapol": "false",
-        "enableDhcpV6": "false",
-        "enableDhcpV4": "true"
-      }
+    componentConfig:
+      "org.opencord.olt.impl.OltFlowService": >
+        {
+          "enableDhcpOnNni": "true",
+          "defaultTechProfileId": "64",
+          "enableIgmpOnNni": "true",
+          "enableEapol": "false",
+          "enableDhcpV6": "false",
+          "enableDhcpV4": "true"
+        }
 
 # override BBSim config
 servicesConfig: